adjust cciss patch and actually apply it

diff --git a/debian/changelog b/debian/changelog
index cd11c29e5cfcc5d3faa1ae34892e5805153afd0d..c2592ac50ba77bedaa971c31bc6a7d51964b9349 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+smartmontools (5.36-4) unstable; urgency=low
+
+  * really apply the cciss patch, thanks again to Frederic Boiteux
+  * adjust the cciss patch to include <linux/cciss.h> instead of
+    "cciss.h", we don't ship a local copy.
+
+ -- Guido Guenther <agx@sigxcpu.org>  Tue, 25 Apr 2006 13:54:17 +0200
+
 smartmontools (5.36-3) unstable; urgency=low
 
   * depend on debianutils (>= 2.2) for run-parts --lsbsysinit, thanks to

diff --git a/debian/patches/00list b/debian/patches/00list
index f0f3f57ad91f08ca0b7f8b484f3d6c5cee0719a1..00a32092245454f13a38fda35a092aa314680c6b 100755 (executable)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@
 03_use-smartd-runner-by-default
 04_remove-Id-from-smartd.conf
 10_remove-redhatism
+60_cciss

diff --git a/debian/patches/60_cciss.dpatch b/debian/patches/60_cciss.dpatch
old mode 100644 (file)
new mode 100755 (executable)
index f2d18a7..9751606
--- a/debian/patches/60_cciss.dpatch
+++ b/debian/patches/60_cciss.dpatch
@@ -13,7 +13,7 @@ diff -rN -u old-smartmontools-cciss/os_linux.c new-smartmontools-cciss/os_linux.
  #include "os_linux.h"
  #include "scsicmds.h"
  #include "utility.h"
-+#include "cciss_ioctl.h"
++#include <linux/cciss_ioctl.h>
 +
  
  #ifndef ENOTSUP