From 8b25612e078e6e93c880b84b603110dec02b5881 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Sat, 25 Oct 2008 01:45:50 +0200 Subject: bcm5974-1.0.1 Fixed a package stability problem when installing on a machine without supported touchpad. Signed-off-by: Henrik Rydberg --- Makefile | 2 +- debian/changelog | 6 ++++ debian/postinst | 2 +- debian/postrm | 2 +- debian/prerm | 2 +- debian/rules | 2 +- usr/src/dkms_source_tree/dkms.conf | 3 +- .../dkms_source_tree/scripts/bcm5974-post-install | 6 ++-- .../dkms_source_tree/scripts/bcm5974-pre-install | 42 ---------------------- 9 files changed, 15 insertions(+), 52 deletions(-) delete mode 100755 usr/src/dkms_source_tree/scripts/bcm5974-pre-install diff --git a/Makefile b/Makefile index f5be66e..ac1c705 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = bcm5974 -VERSION = 1.0 +VERSION = 1.0.1 SRC = usr/src ETC = etc/modprobe.d diff --git a/debian/changelog b/debian/changelog index d6a45f8..cd42af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcm5974-dkms (1.0.1) unstable; urgency=low + + * Package stability when device not supported fixed + + -- Henrik Rydberg Sat, 25 Oct 2008 01:39:20 +0200 + bcm5974-dkms (1.0) unstable; urgency=low * Support for MacBookPro 5,1 (unibody) confirmed diff --git a/debian/postinst b/debian/postinst index 32fdaab..d0b74cd 100644 --- a/debian/postinst +++ b/debian/postinst @@ -3,7 +3,7 @@ set -e NAME=bcm5974 -VERSION=1.0 +VERSION=1.0.1 case "$1" in configure) diff --git a/debian/postrm b/debian/postrm index 9ec40a4..e89ac95 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh NAME=bcm5974 -VERSION=1.0 +VERSION=1.0.1 set -e diff --git a/debian/prerm b/debian/prerm index 8414ebb..2a82c19 100644 --- a/debian/prerm +++ b/debian/prerm @@ -1,7 +1,7 @@ #!/bin/sh NAME=bcm5974 -VERSION=1.0 +VERSION=1.0.1 set -e diff --git a/debian/rules b/debian/rules index 165eb5c..f4c2023 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 NAME=bcm5974 -VERSION=1.0 +VERSION=1.0.1 configure: configure-stamp configure-stamp: diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf index 6119821..8df8763 100644 --- a/usr/src/dkms_source_tree/dkms.conf +++ b/usr/src/dkms_source_tree/dkms.conf @@ -1,10 +1,9 @@ NAME=bcm5974 -VERSION=1.0 +VERSION=1.0.1 PACKAGE_NAME="$NAME" PACKAGE_VERSION="$VERSION" MAKE[0]="make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules" 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" diff --git a/usr/src/dkms_source_tree/scripts/bcm5974-post-install b/usr/src/dkms_source_tree/scripts/bcm5974-post-install index 8207a45..487730b 100755 --- a/usr/src/dkms_source_tree/scripts/bcm5974-post-install +++ b/usr/src/dkms_source_tree/scripts/bcm5974-post-install @@ -50,7 +50,7 @@ if [ -x $LSUSB ]; then done else echo \* USB device: UNKNOWN - lsusb not found - exit 1 + exit -1 fi if [ "$SED" != "" ]; then @@ -58,6 +58,6 @@ if [ "$SED" != "" ]; then mv $ETCPATH.tmp $ETCPATH exit 0 else - echo No suitable device found - exit 1 + echo warning: No suitable device found + exit 0 fi diff --git a/usr/src/dkms_source_tree/scripts/bcm5974-pre-install b/usr/src/dkms_source_tree/scripts/bcm5974-pre-install deleted file mode 100755 index 1e2b864..0000000 --- a/usr/src/dkms_source_tree/scripts/bcm5974-pre-install +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# -# bcm5943-pre-install - check system before installing 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 -LSUSB=/usr/sbin/lsusb - -PAT[0]="05ac:022" -PAT[1]="05ac:023" - -if [ -x $LSUSB ]; then - if [ "`$LSUSB|grep ${PAT[0]}`" != "" ]; then - exit 0 - elif [ "`$LSUSB|grep ${PAT[1]}`" != "" ]; then - exit 0 - else - echo bcm5974: no suitable device found - exit -1 - fi -else - echo bcm5974: cannot determine device type - exit -1 -fi - -exit 0 -- cgit v1.2.3