Fix linux-header dependencies

dkms pulls in linux-headers, which right now brings in linux-headers-2.6.24-16,
which doesn't relate to the current kernel.  By changing the depends for
cp210x-module-dkms to use linux-headers-generic, it pulls in the correct
headers, 2.6.24-25, and sets the proper symlinks for the build of cp210x to
work correctly.

diff --git a/Makefile b/Makefile
index ead51e3dd9d7b43800763d684cd9539666e42eba..cb03d6b3702c45f5fb83850c6da45e8bbe1d4a79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 PKGVER  = 0.11.1
 DEBDIST = hardy
-DEBRELEASE = 2tmi
+DEBRELEASE = 3tmi
 
 
 # No need to change anything below this line

diff --git a/debian.in/control b/debian.in/control
index 06c4ffb127a2a6500c56958a2e9720b2ff2aadf4..062f77ed1aa033f5d2e6be5cc6c95db11b85cc96 100644 (file)
--- a/debian.in/control
+++ b/debian.in/control
@@ -7,9 +7,14 @@ Build-Depends: dpkg-dev (>= 1.13.9)
 
 Package: xxPACKAGExx
 Architecture: all
-Depends: dkms (>> 2.0.20), linux-headers, linux-image, binutils (>= 2.9.5.0.12), gcc (>= 4:4.2.2), dpatch, file, bzip2, lsb-release
-Conflicts: cp210x-module-2.6.24-19-generic, cp210x-module-2.6.24-21-generic, cp210x-module-2.6.24-22-generic, cp210x-module-2.6.24-23-generic, cp210x-module-2.6.24-24-generic, cp210x-module-2.6.24-25-generic
-Replaces: cp210x-module-2.6.24-19-generic, cp210x-module-2.6.24-21-generic, cp210x-module-2.6.24-22-generic, cp210x-module-2.6.24-23-generic, cp210x-module-2.6.24-24-generic, cp210x-module-2.6.24-25-generic
+Depends: dkms (>> 2.0.20), linux-headers-generic, linux-image,
+  binutils (>= 2.9.5.0.12), gcc (>= 4:4.2.2), dpatch, file, bzip2, lsb-release
+Conflicts: cp210x-module-2.6.24-19-generic, cp210x-module-2.6.24-21-generic,
+  cp210x-module-2.6.24-22-generic, cp210x-module-2.6.24-23-generic,
+  cp210x-module-2.6.24-24-generic, cp210x-module-2.6.24-25-generic
+Replaces: cp210x-module-2.6.24-19-generic, cp210x-module-2.6.24-21-generic,
+  cp210x-module-2.6.24-22-generic, cp210x-module-2.6.24-23-generic,
+  cp210x-module-2.6.24-24-generic, cp210x-module-2.6.24-25-generic
 Priority: extra
 Description: Enhanced USB/serial kernel module for cp210x based devices.
   This module blacklists the standard cp2101 module installed in the kernel,