Package: i8kutils
Version: 1.27
Followup-For: Bug #356432
See the attached patch.
diff -durN i8kutils-1.27/debian/i8kbuttons.init
i8kutils-1.27.mine/debian/i8kbuttons.init
--- i8kutils-1.27/debian/i8kbuttons.init 2005-02-03 20:03:14.000000000
+0100
+++ i8kutils-1.27.mine/debian/i8kbuttons.init 1970-01-01 01:00:00.000000000
+0100
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-# i8kbuttons Dell Inspiron volume buttons monitor
-#
-# Written by Miquel van Smoorenburg <[EMAIL PROTECTED]>.
-# Modified for Debian GNU/Linux
-# by Ian Murdock <[EMAIL PROTECTED]>.
-#
-# Modified for i8kutils by Massimo Dal Zotto <[EMAIL PROTECTED]>
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/i8kbuttons
-CONFIGFILE=/etc/i8kbuttons
-PROC_I8K=/proc/i8k
-NAME=i8kbuttons
-DESC="Dell Inspiron volume buttons monitor"
-
-set -e
-
-test -x $DAEMON || exit 0
-test -e $CONFIGFILE && . $CONFIGFILE
-
-function i8k_setkeycodes() {
- kvers="$(uname -r)"
- test "${kvers#2.6.}" != "$kvers" || return
- test "$I8KBUTTONS_SETKEYCODES" = true || return
- keys=$(getkeycodes | grep "^e0 00" | awk '{print $4,$5}')
- test "$keys" = "${I8K_KEY_PLAY:-171} ${I8K_KEY_STOP:-172}" && return
-
- setkeycodes ${I8K_SCAN_PLAY:-e001} ${I8K_KEY_PLAY:-171}
- setkeycodes ${I8K_SCAN_STOP:-e002} ${I8K_KEY_STOP:-172}
- setkeycodes ${I8K_SCAN_PREV:-e003} ${I8K_KEY_PREV:-187}
- setkeycodes ${I8K_SCAN_NEXT:-e004} ${I8K_KEY_NEXT:-189}
- setkeycodes ${I8K_SCAN_MUTE:-e020} ${I8K_KEY_MUTE:-113}
- setkeycodes ${I8K_SCAN_VOLD:-e02e} ${I8K_KEY_VOLD:-114}
- setkeycodes ${I8K_SCAN_VOLU:-e030} ${I8K_KEY_VOLU:-114}
-}
-
-case "$1" in
- start)
- i8k_setkeycodes &>/dev/null || true
- test -e "$PROC_I8K" || exit 0
- test -n "$I8KBUTTONS_UP_CMD" -o \
- -n "$I8KBUTTONS_DOWN_CMD" -o \
- -n "$I8KBUTTONS_MUTE_CMD" \
- || exit 0
- echo -n "Starting $DESC: $NAME"
- start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
- --exec $DAEMON --background --make-pidfile -- \
- --up "$I8KBUTTONS_UP_CMD" \
- --down "$I8KBUTTONS_DOWN_CMD" \
- --mute "$I8KBUTTONS_MUTE_CMD" \
- --timeout "${I8KBUTTONS_TIMEOUT:-100}" \
- --repeat "${I8KBUTTONS_REPEAT:-0}"
- echo "."
- ;;
- stop)
- echo -n "Stopping $DESC: $NAME "
- start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
- echo "."
- rm -f /var/run/$NAME.pid
- ;;
- restart|reload|force-reload)
- # Reload is not supported by i8kbuttons
- test -e "$PROC_I8K" || exit 0
- test -n "$I8KBUTTONS_UP_CMD" -o \
- -n "$I8KBUTTONS_DOWN_CMD" -o \
- -n "$I8KBUTTONS_MUTE_CMD" \
- || exit 0
- echo -n "Restarting $DESC: $NAME"
- start-stop-daemon --oknodo --stop --quiet \
- --pidfile /var/run/$NAME.pid
- rm -f /var/run/$NAME.pid
- sleep 1
- start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
- --exec $DAEMON --background --make-pidfile -- \
- --up "$I8KBUTTONS_UP_CMD" \
- --down "$I8KBUTTONS_DOWN_CMD" \
- --mute "$I8KBUTTONS_MUTE_CMD" \
- --timeout "${I8KBUTTONS_TIMEOUT:-100}" \
- --repeat "${I8KBUTTONS_REPEAT:-0}"
- echo "."
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff -durN i8kutils-1.27/debian/i8kmon.init
i8kutils-1.27.mine/debian/i8kmon.init
--- i8kutils-1.27/debian/i8kmon.init 2005-02-03 20:03:22.000000000 +0100
+++ i8kutils-1.27.mine/debian/i8kmon.init 1970-01-01 01:00:00.000000000
+0100
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# i8kmon Dell Inspiron fan/cpu-temperature monitor
-#
-# Written by Miquel van Smoorenburg <[EMAIL PROTECTED]>.
-# Modified for Debian GNU/Linux
-# by Ian Murdock <[EMAIL PROTECTED]>.
-#
-# Modified for i8kutils by Karl E. Jørgensen <[EMAIL PROTECTED]>
-# and Massimo Dal Zotto <[EMAIL PROTECTED]>
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/i8kmon
-CONFIGFILE=/etc/i8kmon
-PROC_I8K=/proc/i8k
-NAME=i8kmon
-DESC="Dell Inspiron fan/cpu-temperature monitor"
-I8KMON_ARGS="--daemon"
-
-set -e
-
-test -x $DAEMON || exit 0
-
-CONFIG_DAEMON=$(
- # Config file /etc/i8kmon is optional
- cat "$CONFIGFILE" 2>/dev/null \
- | sed 's/#.*//g;/config(daemon)/!d;s/.*(.*)[ ]*//g'
-)
-
-case "$1" in
- start)
- test -e "$PROC_I8K" || exit 0
- test "$CONFIG_DAEMON" = 1 || exit 0
- echo -n "Starting $DESC: $NAME"
- start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
- --exec $DAEMON --background --make-pidfile -- $I8KMON_ARGS
- echo "."
- ;;
- stop)
- echo -n "Stopping $DESC: $NAME "
- start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
- echo "."
- rm -f /var/run/$NAME.pid
- ;;
- restart|reload|force-reload)
- # Sending SIGHUP doesn't work since tclsh doesn't handle signals
- test -e "$PROC_I8K" || exit 0
- test "$CONFIG_DAEMON" = 1 || exit 0
- echo -n "Restarting $DESC: $NAME"
- start-stop-daemon --oknodo --stop --quiet \
- --pidfile /var/run/$NAME.pid
- rm -f /var/run/$NAME.pid
- sleep 1
- start-stop-daemon --start --quiet \
- --pidfile /var/run/$NAME.pid --exec $DAEMON \
- --background --make-pidfile -- $I8KMON_ARGS
- echo "."
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff -durN i8kutils-1.27/debian/i8kutils.i8kbuttons.init
i8kutils-1.27.mine/debian/i8kutils.i8kbuttons.init
--- i8kutils-1.27/debian/i8kutils.i8kbuttons.init 1970-01-01
01:00:00.000000000 +0100
+++ i8kutils-1.27.mine/debian/i8kutils.i8kbuttons.init 2005-02-03
20:03:14.000000000 +0100
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# i8kbuttons Dell Inspiron volume buttons monitor
+#
+# Written by Miquel van Smoorenburg <[EMAIL PROTECTED]>.
+# Modified for Debian GNU/Linux
+# by Ian Murdock <[EMAIL PROTECTED]>.
+#
+# Modified for i8kutils by Massimo Dal Zotto <[EMAIL PROTECTED]>
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/i8kbuttons
+CONFIGFILE=/etc/i8kbuttons
+PROC_I8K=/proc/i8k
+NAME=i8kbuttons
+DESC="Dell Inspiron volume buttons monitor"
+
+set -e
+
+test -x $DAEMON || exit 0
+test -e $CONFIGFILE && . $CONFIGFILE
+
+function i8k_setkeycodes() {
+ kvers="$(uname -r)"
+ test "${kvers#2.6.}" != "$kvers" || return
+ test "$I8KBUTTONS_SETKEYCODES" = true || return
+ keys=$(getkeycodes | grep "^e0 00" | awk '{print $4,$5}')
+ test "$keys" = "${I8K_KEY_PLAY:-171} ${I8K_KEY_STOP:-172}" && return
+
+ setkeycodes ${I8K_SCAN_PLAY:-e001} ${I8K_KEY_PLAY:-171}
+ setkeycodes ${I8K_SCAN_STOP:-e002} ${I8K_KEY_STOP:-172}
+ setkeycodes ${I8K_SCAN_PREV:-e003} ${I8K_KEY_PREV:-187}
+ setkeycodes ${I8K_SCAN_NEXT:-e004} ${I8K_KEY_NEXT:-189}
+ setkeycodes ${I8K_SCAN_MUTE:-e020} ${I8K_KEY_MUTE:-113}
+ setkeycodes ${I8K_SCAN_VOLD:-e02e} ${I8K_KEY_VOLD:-114}
+ setkeycodes ${I8K_SCAN_VOLU:-e030} ${I8K_KEY_VOLU:-114}
+}
+
+case "$1" in
+ start)
+ i8k_setkeycodes &>/dev/null || true
+ test -e "$PROC_I8K" || exit 0
+ test -n "$I8KBUTTONS_UP_CMD" -o \
+ -n "$I8KBUTTONS_DOWN_CMD" -o \
+ -n "$I8KBUTTONS_MUTE_CMD" \
+ || exit 0
+ echo -n "Starting $DESC: $NAME"
+ start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+ --exec $DAEMON --background --make-pidfile -- \
+ --up "$I8KBUTTONS_UP_CMD" \
+ --down "$I8KBUTTONS_DOWN_CMD" \
+ --mute "$I8KBUTTONS_MUTE_CMD" \
+ --timeout "${I8KBUTTONS_TIMEOUT:-100}" \
+ --repeat "${I8KBUTTONS_REPEAT:-0}"
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME "
+ start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
+ echo "."
+ rm -f /var/run/$NAME.pid
+ ;;
+ restart|reload|force-reload)
+ # Reload is not supported by i8kbuttons
+ test -e "$PROC_I8K" || exit 0
+ test -n "$I8KBUTTONS_UP_CMD" -o \
+ -n "$I8KBUTTONS_DOWN_CMD" -o \
+ -n "$I8KBUTTONS_MUTE_CMD" \
+ || exit 0
+ echo -n "Restarting $DESC: $NAME"
+ start-stop-daemon --oknodo --stop --quiet \
+ --pidfile /var/run/$NAME.pid
+ rm -f /var/run/$NAME.pid
+ sleep 1
+ start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+ --exec $DAEMON --background --make-pidfile -- \
+ --up "$I8KBUTTONS_UP_CMD" \
+ --down "$I8KBUTTONS_DOWN_CMD" \
+ --mute "$I8KBUTTONS_MUTE_CMD" \
+ --timeout "${I8KBUTTONS_TIMEOUT:-100}" \
+ --repeat "${I8KBUTTONS_REPEAT:-0}"
+ echo "."
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff -durN i8kutils-1.27/debian/i8kutils.i8kmon.init
i8kutils-1.27.mine/debian/i8kutils.i8kmon.init
--- i8kutils-1.27/debian/i8kutils.i8kmon.init 1970-01-01 01:00:00.000000000
+0100
+++ i8kutils-1.27.mine/debian/i8kutils.i8kmon.init 2005-02-03
20:03:22.000000000 +0100
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# i8kmon Dell Inspiron fan/cpu-temperature monitor
+#
+# Written by Miquel van Smoorenburg <[EMAIL PROTECTED]>.
+# Modified for Debian GNU/Linux
+# by Ian Murdock <[EMAIL PROTECTED]>.
+#
+# Modified for i8kutils by Karl E. Jørgensen <[EMAIL PROTECTED]>
+# and Massimo Dal Zotto <[EMAIL PROTECTED]>
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/i8kmon
+CONFIGFILE=/etc/i8kmon
+PROC_I8K=/proc/i8k
+NAME=i8kmon
+DESC="Dell Inspiron fan/cpu-temperature monitor"
+I8KMON_ARGS="--daemon"
+
+set -e
+
+test -x $DAEMON || exit 0
+
+CONFIG_DAEMON=$(
+ # Config file /etc/i8kmon is optional
+ cat "$CONFIGFILE" 2>/dev/null \
+ | sed 's/#.*//g;/config(daemon)/!d;s/.*(.*)[ ]*//g'
+)
+
+case "$1" in
+ start)
+ test -e "$PROC_I8K" || exit 0
+ test "$CONFIG_DAEMON" = 1 || exit 0
+ echo -n "Starting $DESC: $NAME"
+ start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+ --exec $DAEMON --background --make-pidfile -- $I8KMON_ARGS
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME "
+ start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid
+ echo "."
+ rm -f /var/run/$NAME.pid
+ ;;
+ restart|reload|force-reload)
+ # Sending SIGHUP doesn't work since tclsh doesn't handle signals
+ test -e "$PROC_I8K" || exit 0
+ test "$CONFIG_DAEMON" = 1 || exit 0
+ echo -n "Restarting $DESC: $NAME"
+ start-stop-daemon --oknodo --stop --quiet \
+ --pidfile /var/run/$NAME.pid
+ rm -f /var/run/$NAME.pid
+ sleep 1
+ start-stop-daemon --start --quiet \
+ --pidfile /var/run/$NAME.pid --exec $DAEMON \
+ --background --make-pidfile -- $I8KMON_ARGS
+ echo "."
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff -durN i8kutils-1.27/debian/rules i8kutils-1.27.mine/debian/rules
--- i8kutils-1.27/debian/rules 2005-06-17 12:46:11.000000000 +0200
+++ i8kutils-1.27.mine/debian/rules 2007-04-01 14:31:45.000000000 +0200
@@ -84,8 +84,8 @@
# dh_installemacsen
# dh_installpam
# dh_installmime
- dh_installinit --init-script=i8kmon
- dh_installinit --init-script=i8kbuttons
+ dh_installinit --name=i8kmon
+ dh_installinit --name=i8kbuttons
# dh_installcron
# dh_installinfo
dh_installman *.1
