9 files changed, 13 insertions, 38 deletions

diff --git a/Makefile b/Makefile
index e10f8d1..f5be66e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = bcm5974
-VERSION = 0.99
+VERSION = 1.0
 SRC     = usr/src
 ETC     = etc/modprobe.d
 
diff --git a/debian/changelog b/debian/changelog
index b13c3f9..d6a45f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-bcm5974-dkms (0.99) unstable; urgency=low
+bcm5974-dkms (1.0) unstable; urgency=low
 
-  * Add support for MacBookPro 5,1 (unibody)
+  * Support for MacBookPro 5,1 (unibody) confirmed
   * Distribute package at launchpad as version 1.0
 
  -- Henrik Rydberg <rydberg@euromail.se>  Fri, 24 Oct 2008 23:36:22 +0200
diff --git a/debian/postinst b/debian/postinst
index 3bc6c41..32fdaab 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=bcm5974
-VERSION=0.99
+VERSION=1.0
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index 9a4ef29..9ec40a4 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=bcm5974
-VERSION=0.99
+VERSION=1.0
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index 7c34eaa..8414ebb 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=bcm5974
-VERSION=0.99
+VERSION=1.0
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index 649ebba..165eb5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=bcm5974
-VERSION=0.99
+VERSION=1.0
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/bcm5974.c b/usr/src/dkms_source_tree/bcm5974.c
index e858f0b..ef2ffab 100644
--- a/usr/src/dkms_source_tree/bcm5974.c
+++ b/usr/src/dkms_source_tree/bcm5974.c
@@ -42,8 +42,13 @@
 #include <linux/mutex.h>
 
 #define USB_VENDOR_ID_APPLE             0x05ac
+
+#ifndef BTN_TOOL_PRESS
 #define BTN_TOOL_PRESS                  0x148
+#endif
+#ifndef BTN_TOOL_QUADTAP
 #define BTN_TOOL_QUADTAP                0x14f
+#endif
 
 /* MacbookAir, aka wellspring */
 #define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI     0x0223
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index df7925c..6119821 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=bcm5974
-VERSION=0.99
+VERSION=1.0
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
@@ -8,4 +8,3 @@ BUILT_MODULE_NAME[0]="bcm5974"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/input/mouse"
 PRE_INSTALL="scripts/bcm5974-pre-install"
 POST_INSTALL="scripts/bcm5974-post-install"
-POST_REMOVE="scripts/bcm5974-post-remove"
diff --git a/usr/src/dkms_source_tree/scripts/bcm5974-post-remove b/usr/src/dkms_source_tree/scripts/bcm5974-post-remove
deleted file mode 100755
index 21977de..0000000
--- a/usr/src/dkms_source_tree/scripts/bcm5974-post-remove
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# bcm5943-post-remove - post-removing the BCM5974
-#
-# Copyright (C) 2008       Henrik Rydberg (rydberg@euromail.se)
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-DRIVER=bcm5974
-ETCPATH=/etc/modprobe.d/$DRIVER
-
-echo -----------------------------------------------------------------------
-
-rm -f $ETCPATH
-
-exit 0