Package: hotkey-setup Version: 0.1-17.1 I plan to NMU hotkey-setup to fix a few issues. I will upload to the 7-day delayed upload queue. Here is the patch I plan to upload. Please let me know if there is some reason why I should not upload this new version. The package is ready to go, and I will wait for 5 hours before doing I upload.
I did not process the laptop specific bugs and patches this time, as I do not yet understand the package well enough to evaluate them. diff -urN hotkey-setup-0.1/debian/changelog hotkey-setup-0.1-pere/debian/changelog --- hotkey-setup-0.1/debian/changelog 2007-08-04 19:10:57.000000000 +0200 +++ hotkey-setup-0.1-pere/debian/changelog 2008-01-01 14:46:21.000000000 +0100 @@ -1,3 +1,28 @@ +hotkey-setup (0.1-17.2) unstable; urgency=low + + * Non-maintainer upload. + * Updated standards-version from 3.6.1 to 3.7.3. No changes needed. + * Make sure init.d script is not executed when the package is removed + but not purged (Closes: #379613). Patch from Vagrant Cascadian. + * Add LSB style dependency header in init.d script (Closes: #376955) + * Remove unneeded stop symlinks in runlevel 0 and 6. Based on patch + from Scott James Remnant and Ubuntu. + * Use -c when checking for /dev/nvram (Closes: #387246). Patch from + Tom May. + * Don't fail when keystate cannot be restored or thinkpad-keys cannot + be terminated when stopping initscript. Patch from Kel Modderman. + * Add a custom prerm script to remove keycodes state file when prerm + of installed package fails (Closes: #437360). Patch from Kel + Modderman. + * Depend on console-tools | console-utilities to make sure the + setkeycodes program is available (Closes: #431329). + * Change init.d shell from /bin/bash to /bin/sh, based on patch from + Paul Sladen and Ubuntu. + * Ensure that the existing scripts are only run on laptops. Based + on patch from Matthew Garrett and Ubuntu. + + -- Petter Reinholdtsen <[EMAIL PROTECTED]> Tue, 1 Jan 2008 14:45:47 +0100 + hotkey-setup (0.1-17.1) unstable; urgency=medium * Non-maintainer upload. diff -urN hotkey-setup-0.1/debian/control hotkey-setup-0.1-pere/debian/control --- hotkey-setup-0.1/debian/control 2007-08-04 19:10:04.000000000 +0200 +++ hotkey-setup-0.1-pere/debian/control 2008-01-01 14:37:30.000000000 +0100 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Matthew Garrett <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.6.1 +Standards-Version: 3.7.3 Package: hotkey-setup Architecture: i386 amd64 -Depends: dmidecode (>= 2.7) +Depends: dmidecode (>= 2.7), laptop-detect, console-tools | console-utilities Conflicts: tpb Description: auto-configures laptop hotkeys This package will attempt to auto-detect your laptop hardware and then diff -urN hotkey-setup-0.1/debian/init.d hotkey-setup-0.1-pere/debian/init.d --- hotkey-setup-0.1/debian/init.d 2006-04-29 21:09:27.000000000 +0200 +++ hotkey-setup-0.1-pere/debian/init.d 2008-01-01 14:47:38.000000000 +0100 @@ -1,4 +1,15 @@ -#!/bin/bash +#!/bin/sh +### BEGIN INIT INFO +# Provides: hotkey-setup +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: Set up laptop keys to generate keycodes. +### END INIT INFO + +# do not run if not package is not installed +test -x /usr/sbin/dumpkeycodes || exit 0 manufacturer=`dmidecode --string system-manufacturer` name=`dmidecode --string system-product-name` @@ -15,7 +26,7 @@ if [ ! -c /dev/input/uinput ]; then modprobe uinput fi - if [ ! -b /dev/nvram ]; then + if [ ! -c /dev/nvram ]; then modprobe nvram fi /usr/sbin/thinkpad-keys && touch $THINKPAD_LOCKFILE @@ -25,6 +36,9 @@ case "$1" in start) +# This entire block does nothing on desktops right now + if laptop-detect; then + /usr/sbin/dumpkeycodes >$SAVED_STATE if [ $? -gt 0 ]; then @@ -105,13 +119,14 @@ . /usr/share/hotkey-setup/default.hk esac . /usr/share/hotkey-setup/generic.hk + fi ;; stop) if [ -f $THINKPAD_LOCKFILE ]; then - kill `pidof thinkpad-keys` && rm -f $THINKPAD_LOCKFILE + kill `pidof thinkpad-keys` || true ; rm -f $THINKPAD_LOCKFILE fi if [ -f $SAVED_STATE ]; then - setkeycodes $(cat $SAVED_STATE) + setkeycodes $(cat $SAVED_STATE) || true fi ;; restart|force-reload) diff -urN hotkey-setup-0.1/debian/postinst hotkey-setup-0.1-pere/debian/postinst --- hotkey-setup-0.1/debian/postinst 1970-01-01 01:00:00.000000000 +0100 +++ hotkey-setup-0.1-pere/debian/postinst 2008-01-01 14:58:19.000000000 +0100 @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# Remove symlinks to script to have them reinserted by debhelper +# without the shutdown and reboot links; this init script does not +# need them. +if dpkg --compare-versions "$2" lt "0.1-17.2"; then + update-rc.d -f hotkey-setup remove +fi + +#DEBHELPER# diff -urN hotkey-setup-0.1/debian/prerm hotkey-setup-0.1-pere/debian/prerm --- hotkey-setup-0.1/debian/prerm 1970-01-01 01:00:00.000000000 +0100 +++ hotkey-setup-0.1-pere/debian/prerm 2008-01-01 14:26:56.000000000 +0100 @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if dpkg --compare-versions "$2" lt "0.1-17.2"; then + # setkeycodes exits with error sometimes (#437360) and has + # completely broken the upgrade path for some users. + # remove the saved state file if installed package prerm + # maintainer script fails. + rm -f /var/run/hotkey-setup +fi + +#DEBHELPER# diff -urN hotkey-setup-0.1/debian/rules hotkey-setup-0.1-pere/debian/rules --- hotkey-setup-0.1/debian/rules 2006-02-06 14:41:37.000000000 +0100 +++ hotkey-setup-0.1-pere/debian/rules 2008-01-01 14:16:59.000000000 +0100 @@ -51,7 +51,7 @@ # dh_installemacsen # dh_installpam # dh_installmime - dh_installinit + dh_installinit -- start 20 2 3 4 5 . stop 20 1 . # dh_installcron # dh_installinfo dh_installman -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]