summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2010-08-30 15:50:07 -0400
committerHenrik Rydberg <rydberg@euromail.se>2010-08-30 23:46:53 +0200
commit978832ab69361f83b0362d0c3e6c6137a9d0a6c1 (patch)
tree17507a09adff0d3fd2f310fde6b5bcf3387cb5bd /debian
parent955b4b2de36b8da40739d87a412a2bca519d40a2 (diff)
Conflict with multitouch-kernel-source
This is needed to prevent someone from installing both hid-dkms and multitouch-kernel-source at the same time. Having two hid.ko modules confuses dkms. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 47ba1d7..ba21bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1hid-dkms (1.0.1) maverick; urgency=low
2
3 * Conflict with multitouch-kernel-source
4
5 -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 30 Aug 2010 15:39:54 -0400
6
1hid-dkms (1.0.0) maverick; urgency=low 7hid-dkms (1.0.0) maverick; urgency=low
2 8
3 * Upgrade to maverick 2.6.36-19-generic 9 * Upgrade to maverick 2.6.36-19-generic
diff --git a/debian/control b/debian/control
index 3beda2e..e33c7cf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Homepage: http://bitmath.org/code/hid-dkms/
9Package: hid-dkms 9Package: hid-dkms
10Architecture: all 10Architecture: all
11Depends: dkms (>= 1.95), bash (>> 1.99) 11Depends: dkms (>= 1.95), bash (>> 1.99)
12Conflicts: multitouch-kernel-source
12Description: Supplementary hid support 13Description: Supplementary hid support
13 This driver supplements the apple function key mapping with useful 14 This driver supplements the apple function key mapping with useful
14 defaults for the Expose (FN+F3), Dashboard (FN+F4) and Insert 15 defaults for the Expose (FN+F3), Dashboard (FN+F4) and Insert