Hello community, here is the log from the commit of package hotkey-setup checked in at Sun Nov 19 18:21:18 CET 2006. -------- --- hotkey-setup/hotkey-setup.changes 2006-11-15 19:04:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/hotkey-setup/hotkey-setup.changes 2006-11-19 17:58:13.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 19 17:55:05 CET 2006 - thoenig@suse.de + +- hotkey-setup.init: remove $THINKPAD_LOCKFILE on `rchotkey-setup + stop` +- hotkey-setup.init: unify usage of tabs and spaces, wipe out + whitespace in various places + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hotkey-setup.spec ++++++ --- /var/tmp/diff_new_pack.ZFncJR/_old 2006-11-19 18:20:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ZFncJR/_new 2006-11-19 18:20:54.000000000 +0100 @@ -15,7 +15,7 @@ Group: System/Boot Summary: hotkey-setup sets up kernel keyboard mapping of laptop extra keys Version: 0.1 -Release: 14 +Release: 17 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 Source1: %name.init @@ -79,6 +79,11 @@ /usr/share/hotkey-setup %changelog -n hotkey-setup +* Sun Nov 19 2006 - thoenig@suse.de +- hotkey-setup.init: remove $THINKPAD_LOCKFILE on `rchotkey-setup + stop` +- hotkey-setup.init: unify usage of tabs and spaces, wipe out + whitespace in various places * Wed Nov 15 2006 - thoenig@suse.de - add patch thinkpad-keys-reduce-polling-thoenig-01.patch: reduce polling interval by a factor of 10 (idle) and respect user ++++++ hotkey-setup.init ++++++ --- hotkey-setup/hotkey-setup.init 2006-11-15 19:04:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/hotkey-setup/hotkey-setup.init 2006-11-19 17:58:13.000000000 +0100 @@ -1,9 +1,9 @@ #!/bin/sh # LSB compatible service control script; see http://www.linuxbase.org/spec/ -# +# # Note: This template uses functions rc_XXX defined in /etc/rc.status on # UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB +# script on this template and ensure that it works on non UL based LSB # compliant Linux distributions, you either have to provide the rc.status # functions from UL or change the script to work without them. # See skeleton.compat for a template that works with other distros as well. @@ -15,10 +15,10 @@ # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: hotkey-setup setup mapping for laptop keys -# Description: This init script sets up vendor specific -# laptop keys mapping to standard Microsoft multimedia -# keyboard keycodes, which can be used by user space -# applications to trigger actions. +# Description: This init script sets up vendor specific laptop +# keys mapping to standard Microsoft multimedia +# keyboard keycodes, which can be used by user space +# applications to trigger actions. ### END INIT INFO . /etc/rc.status @@ -27,7 +27,7 @@ rc_reset # Return values acc. to LSB for all commands but status: -# 0 - success +# 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") @@ -36,7 +36,7 @@ # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are @@ -139,7 +139,7 @@ ;; *) - . /usr/share/hotkey-setup/default.hk + . /usr/share/hotkey-setup/default.hk esac . /usr/share/hotkey-setup/generic.hk @@ -148,38 +148,41 @@ case "$1" in start) - echo -n "Starting hotkey-setup " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - run_hotkey_setup - - # Remember status and be verbose - rc_status -v - ;; + echo -n "Starting hotkey-setup " + ## Start daemon with startproc(8). If this fails + ## the return value is set appropriately by startproc. + run_hotkey_setup + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down hotkey-setup " - killproc -TERM /usr/sbin/thinkpad-keys + echo -n "Shutting down hotkey-setup " + + if [ -f $THINKPAD_LOCKFILE ]; then + killproc -TERM /usr/sbin/thinkpad-keys && rm -f $THINKPAD_LOCKFILE + fi if [ -f $SAVED_STATE ]; then setkeycodes $(cat $SAVED_STATE) rm -f $SAVED_STATE fi - # Remember status and be verbose - rc_status -v - ;; + # Remember status and be verbose + rc_status -v + ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop || true - $0 start - - # Remember status and be quiet - rc_status - ;; + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop || true + $0 start + + # Remember status and be quiet + rc_status + ;; *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; esac rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org