Removed dependency on usbhid

In 2.6.28, the only additional configuration needed is for the new
macbooks using the wellspring3 device. The configuration is already
upstream, in a stalled commit ac26fca3 which is in hid-core, not
usbhid. Since jaunty comes with hid built in, there is no need or
possibility to use dkms for the configuration, but one must resort
to other methods.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

8 files changed, 13 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 78c2ee3..47d8f92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = bcm5974
-VERSION = 1.1.2
+VERSION = 1.1.3
 SRC     = usr/src
 
 TARBALL = $(NAME)-$(VERSION).dkms.tar.gz
diff --git a/debian/changelog b/debian/changelog
index e8b8e9d..2b1d7d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcm5974-dkms (1.1.3) jaunty; urgency=low
+
+  * Removed dependency on usbhid
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Thu, 19 Mar 2009 02:07:08 +0100
+
 bcm5974-dkms (1.1.2) jaunty; urgency=low
 
   * Rebuild for jaunty
diff --git a/debian/control b/debian/control
index ea07135..ecc0ac2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://bitmath.org/code/bcm5974-dkms/
 
 Package: bcm5974-dkms
 Architecture: all
-Depends: dkms (>= 1.95), bash (>> 1.99), usbhid-dkms
+Depends: dkms (>= 1.95), bash (>> 1.99)
 Description: Apple USB BCM5974 Multitouch trackpad support (DKMS)
  This driver adds support for the multitouch trackpad on the new
  Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
diff --git a/debian/postinst b/debian/postinst
index f029a76..ebfff7c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=bcm5974
-VERSION=1.1.2
+VERSION=1.1.3
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index d6dc311..748a74f 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=bcm5974
-VERSION=1.1.2
+VERSION=1.1.3
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index 5772eb8..b0dca72 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=bcm5974
-VERSION=1.1.2
+VERSION=1.1.3
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index 716e724..453f800 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=bcm5974
-VERSION=1.1.2
+VERSION=1.1.3
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 1222e74..bcec41d 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=bcm5974
-VERSION=1.1.2
+VERSION=1.1.3
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}