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 @@
+hid-dkms (1.0.1) maverick; urgency=low
+
+  * Conflict with multitouch-kernel-source
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Mon, 30 Aug 2010 15:39:54 -0400
+
 hid-dkms (1.0.0) maverick; urgency=low
 
   * 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/
 Package: hid-dkms
 Architecture: all
 Depends: dkms (>= 1.95), bash (>> 1.99)
+Conflicts: multitouch-kernel-source
 Description: Supplementary hid support
  This driver supplements the apple function key mapping with useful
  defaults for the Expose (FN+F3), Dashboard (FN+F4) and Insert