bcm5974-dkms 1.1.0

This is a reworked debian source DKMS package, in a shared git/bzr setup.

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

12 files changed, 67 insertions, 47 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f682682
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.bzr
+.bzrignore
+usr/src/bcm5974-*.dkms.tar.gz
diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000..4a27fda
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,27 @@
+Modifying and building the DKMS package
+
+1. use bzr to sync source with launchpad
+
+2. make your changes
+
+3. modify the VERSION variable in Makefile, then do
+
+   make bump
+
+4. add a new entry to debian/changelog, matching VERSION
+
+5. build binary package for testing with
+
+   dpkg-buildpackage
+
+6. clean the checkout with
+
+   make distclean
+
+7. build source package for upload with
+
+   debuild -S -sa
+
+8. upload packacke to ppa with (see ~/.dput.cf)
+
+   dput your-mactel-ppa-dput-entry name-and-version_source.changes
diff --git a/Makefile b/Makefile
index ac1c705..987f90e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 NAME    = bcm5974
-VERSION = 1.0.1
+VERSION = 1.1.0
 SRC     = usr/src
-ETC     = etc/modprobe.d
 
 TARBALL = $(NAME)-$(VERSION).dkms.tar.gz
 PATCH   = ./scripts/patch-name-version.sh $(NAME) $(VERSION)
@@ -19,9 +18,7 @@ distclean: clean
 
 install: $(SRC)/$(TARBALL)
         install -d "$(DESTDIR)/$(SRC)"
-        install -d "$(DESTDIR)/$(ETC)"
         install -m 644 $(SRC)/$(NAME)-$(VERSION).dkms.tar.gz "$(DESTDIR)/$(SRC)"
-        install -m 644 $(ETC)/$(NAME) "$(DESTDIR)/$(ETC)"
 
 bump:
         $(PATCH) debian/postinst
diff --git a/debian/changelog b/debian/changelog
index cd42af0..63e7a9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-bcm5974-dkms (1.0.1) unstable; urgency=low
+bcm5974-dkms (1.1.0) intrepid; urgency=low
 
-  * Package stability when device not supported fixed
+  * Kernel configuration removed; now depends on the usbhid-dkms package.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sat, 25 Oct 2008 01:39:20 +0200
 
diff --git a/debian/control b/debian/control
index 07c8bcb..afa83c0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://web.comhem.se/rydberg/Bits/
 
 Package: bcm5974-dkms
 Architecture: all
-Depends: dkms (>= 1.95), bash (>> 1.99)
+Depends: dkms (>= 1.95), bash (>> 1.99), usbhid-dkms
 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/dirs b/debian/dirs
index fee20a1..b601f22 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1 @@
-etc/modprobe.d
 usr/src
diff --git a/debian/postinst b/debian/postinst
index d0b74cd..e10a0d5 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=bcm5974
-VERSION=1.0.1
+VERSION=1.1.0
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index e89ac95..c1d236c 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=bcm5974
-VERSION=1.0.1
+VERSION=1.1.0
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index 2a82c19..f1ebd99 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=bcm5974
-VERSION=1.0.1
+VERSION=1.1.0
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index f4c2023..9c03321 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=bcm5974
-VERSION=1.0.1
+VERSION=1.1.0
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 8df8763..d56f701 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.0.1
+VERSION=1.1.0
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
diff --git a/usr/src/dkms_source_tree/scripts/bcm5974-diagnostics b/usr/src/dkms_source_tree/scripts/bcm5974-diagnostics
index acd0bf4..b59c496 100755
--- a/usr/src/dkms_source_tree/scripts/bcm5974-diagnostics
+++ b/usr/src/dkms_source_tree/scripts/bcm5974-diagnostics
@@ -68,7 +68,7 @@ if [ -f $MODULES ]; then
     fi
 fi
 
-# Do we have old quirks?
+# Do we have old options quirks?
 MODPROBE=/etc/modprobe.d/options
 if [ -f $MODPROBE ]; then
     MODPROBEOPTS=`grep quirks= $MODPROBE|grep -v ^#|grep 0x05ac:0x02`
@@ -82,21 +82,13 @@ else
     echo \* $MODPROBE: file not found
 fi
 
-# Do we have the right quirks?
+# Do we have old bcm5974 quirks?
 DRIVMOD=/etc/modprobe.d/$DRIVER
 if [ -f $DRIVMOD ]; then
-    DRIVMODOPTS=`grep quirks= $DRIVMOD|grep -v ^#|grep 0x05ac:0x02`
-    if [ "$DRIVMODOPTS" != "" ]; then
-        echo \* $DRIVMOD: has quirks, good
-    else
-        echo \* $DRIVMOD: does NOT have quirks
-        echo Uncomment the right quirk line in $DRIVMOD
-        exit 1
-    fi
-else
-    echo \* $DRIVMOD: file not found
-    echo Copy the etc/modprobe.d/bcm5974 file to /etc/modprobe.d/
+    echo \* $DRIVMOD: exists - please remove file
     exit 1
+else
+    echo \* $DRIVMOD: no such file, good
 fi
 
 # Did the depmod bite?
@@ -152,66 +144,68 @@ DIFF=/tmp/synclient-output.diff.$$
 TMP=/tmp/synclient-output.txt.$$
 synclient -l | grep -v Parameter | sort > $TMP
 diff -u - $TMP > $DIFF <<EOF
-    AccelFactor             = 0.1
-    BottomEdge              = 800
+    AccelFactor             = 0.0331345
+    BottomEdge              = 756
     CircScrollDelta         = 0.1
     CircScrollTrigger       = 0
     CircularPad             = 0
     CircularScrolling       = 0
+    ClickFinger1            = 1
+    ClickFinger2            = 3
+    ClickFinger3            = 2
     ClickTime               = 100
     CoastingSpeed           = 0
     CornerCoasting          = 0
-    EdgeMotionMaxSpeed      = 80
+    EdgeMotionMaxSpeed      = 120
     EdgeMotionMaxZ          = 160
     EdgeMotionMinSpeed      = 1
-    EdgeMotionMinZ          = 30
+    EdgeMotionMinZ          = 29
     EdgeMotionUseAlways     = 0
     EmulateMidButtonTime    = 75
-    EmulateTwoFingerMinZ    = 257
+    EmulateTwoFingerMinZ    = 281
     FastTaps                = 0
-    FingerHigh              = 80
-    FingerLow               = 16
+    FingerHigh              = 29
+    FingerLow               = 25
     FingerPress             = 256
     GrabEventDevice         = 1
     GuestMouseOff           = 0
     HorizEdgeScroll         = 0
-    HorizScrollDelta        = 0
-    HorizTwoFingerScroll    = 1
+    HorizScrollDelta        = 30
+    HorizTwoFingerScroll    = 0
     LBCornerButton          = 0
-    LeftEdge                = 0
+    LeftEdge                = 51
     LeftRightScrolling      = 1
     LeftRightScrollRepeat   = 1
     LockedDrags             = 0
     LockedDragTimeout       = 5000
     LTCornerButton          = 0
-    MaxDoubleTapTime        = 200
-    MaxSpeed                = 1.2
-    MaxTapMove              = 100
-    MaxTapTime              = 223
-    MinSpeed                = 0.8
-    MultiFingerButton       = 2
+    MaxDoubleTapTime        = 180
+    MaxSpeed                = 1
+    MaxTapMove              = 66
+    MaxTapTime              = 180
+    MinSpeed                = 0.75
     PalmDetect              = 0
     PalmMinWidth            = 10
-    PalmMinZ                = 200
+    PalmMinZ                = 199
     PressureMotionMaxFactor = 1
     PressureMotionMaxZ      = 160
     PressureMotionMinFactor = 1
-    PressureMotionMinZ      = 10
+    PressureMotionMinZ      = 29
     RBCornerButton          = 0
-    RightEdge               = 1280
+    RightEdge               = 1229
     RTCornerButton          = 0
     ScrollButtonRepeat      = 100
     SingleTapTimeout        = 180
     TapButton1              = 0
     TapButton2              = 0
     TapButton3              = 0
-    TopEdge                 = 0
+    TopEdge                 = 44
     TouchpadOff             = 0
     TrackstickSpeed         = 40
     UpDownScrolling         = 1
     UpDownScrollRepeat      = 1
     VertEdgeScroll          = 0
-    VertScrollDelta         = 40
+    VertScrollDelta         = 30
     VertTwoFingerScroll     = 1
 EOF
 rm -f $TMP