diff --git a/system/usb_modeswitch/doinst.sh b/system/usb_modeswitch/doinst.sh index 15d74ae5c9..9bae9c55c7 100644 --- a/system/usb_modeswitch/doinst.sh +++ b/system/usb_modeswitch/doinst.sh @@ -10,7 +10,6 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } - config etc/usb_modeswitch.conf.new - chroot . /etc/rc.d/rc.udev reload + diff --git a/system/usb_modeswitch/usb_modeswitch.SlackBuild b/system/usb_modeswitch/usb_modeswitch.SlackBuild old mode 100644 new mode 100755 index 6de04c51ff..926dcb56ca --- a/system/usb_modeswitch/usb_modeswitch.SlackBuild +++ b/system/usb_modeswitch/usb_modeswitch.SlackBuild @@ -4,9 +4,9 @@ # Written by David Somero # Derived from Slackware's Slackbuilds. -# + # Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA -# Copyright 2010 David Somero (dsomero@hotmail.com) Athens, TN, USA +# Copyright 2010 David Somero, Athens, TN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,11 +27,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=usb_modeswitch -VERSION=${VERSION:-1.0.7} +VERSION=${VERSION:-1.1.1} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Upstream is playing guess the program name. +SRCPRGNAM=$(echo $PRGNAM | tr _ -) + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -53,9 +56,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $SRCPRGNAM-$VERSION +tar xvf $CWD/$SRCPRGNAM-$VERSION.tar.bz2 +cd $SRCPRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -68,9 +71,8 @@ make clean gcc $SLKCFLAGS $LDFLAGS -lusb -Wall -o usb_modeswitch usb_modeswitch.c install -D -s -m0755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch -install -D -m0755 usb_modeswitch.tcl $PKG/usr/sbin/usb_modeswitch.tcl -install -D -m0755 usb_modeswitch.sh $PKG/usr/sbin/usb_modeswitch.sh -install -D -m0644 80-usb_modeswitch.rules $PKG/lib/udev/rules.d/80-usb_modeswitch.rules +install -D -m0755 usb_modeswitch.sh $PKG/lib/udev/usb_modeswitch +install -D -m0644 40-usb_modeswitch.rules $PKG/lib/udev/rules.d/40-usb_modeswitch.rules install -D -m0644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new mv usb_modeswitch.d $PKG/etc diff --git a/system/usb_modeswitch/usb_modeswitch.info b/system/usb_modeswitch/usb_modeswitch.info index fd70bd2261..9997746401 100644 --- a/system/usb_modeswitch/usb_modeswitch.info +++ b/system/usb_modeswitch/usb_modeswitch.info @@ -1,10 +1,10 @@ PRGNAM="usb_modeswitch" -VERSION="1.0.7" +VERSION="1.1.1" HOMEPAGE="http://www.draisberghof.de/usb_modeswitch" -DOWNLOAD="http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.7.tar.bz2" -MD5SUM="a9d05c785ade1b06097d53f4423bd5c6" +DOWNLOAD="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.1.tar.bz2" +MD5SUM="4c2642a25cc1667c39f955f0465f46d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Somero" EMAIL="dsomero@hotmail.com" -APPROVED="Erik Hanson" +APPROVED="rworkman"