[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-74-g83c9b5c
Ben Armstrong
synrg at debian.org
Fri Nov 12 11:02:33 UTC 2010
The following commit has been merged in the master branch:
commit 83c9b5c5d87f96da352d5bb920383ee970e2e3de
Author: Luca Niccoli <lultimouomo at gmail.com>
Date: Mon Nov 8 17:23:41 2010 +0100
Listen only to netlink events; depend on acpid >= 1:2.0.0-1 since very old versions don't support netlink
Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 2ad5cd4..6a879fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ eeepc-acpi-scripts (1.1.11) UNRELEASED; urgency=low
* Turn off volume handling by default - most desktop environment already
do it.
* Drop aosd; use libnotify instead.
+ * Listen only to netlink events and drop duplicate event logic. Depend on
+ acpid >= 2.0.0-1 since very old versions don't support netlink.
-- Ben Armstrong <synrg at sanctuary.nslug.ns.ca> Sun, 03 Oct 2010 08:18:22 -0300
diff --git a/debian/control b/debian/control
index a4ad362..691c424 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ DM-Upload-Allowed: yes
Package: eeepc-acpi-scripts
Architecture: all
-Depends: acpid (>= 1.0.8-6), acpi-support-base, acpi-support, pm-utils, rfkill (>= 0.3-3),
+Depends: acpid (>= 1:2.0.0-1), acpi-support-base, acpi-support, pm-utils, rfkill (>= 0.3-3),
${misc:Depends}
Suggests: alsa-utils, libnotify-bin
Description: Scripts to support suspend and hotkeys on the Asus Eee PC laptop
diff --git a/debian/preinst b/debian/preinst
index 52e4bf8..5892d8b 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -46,6 +46,9 @@ case "$1" in
prep_mv_conffile "/etc/acpi/lib/shengine.sh"
prep_mv_conffile "/etc/acpi/lib/sound.sh"
prep_mv_conffile "/etc/acpi/lib/touchpad.sh"
+ prep_mv_conffile "/etc/acpi/events/asus-eee-hotkey"
+ prep_mv_conffile "/etc/acpi/events/asus-eee-hotkey-button"
+ prep_mv_conffile "/etc/acpi/events/asus-eee-hotkey-video"
fi
;;
diff --git a/eeepc-acpi-scripts/hotkey.sh b/eeepc-acpi-scripts/hotkey.sh
index caa4ccd..1895259 100755
--- a/eeepc-acpi-scripts/hotkey.sh
+++ b/eeepc-acpi-scripts/hotkey.sh
@@ -24,29 +24,6 @@ value=$(test "x$1" = x- && cat "$BACKLIGHT" || echo "0x$3")
LINUX_MINOR_REV=`uname -r | cut -c 5,6`
-# In case keys are doubly-reported as hotkey and something else.
-# It's random (and irrelevant) which is seen first.
-acpi=
-acpiwrite=
-ACPITEST=/lib/init/rw/eeepc-acpi-scripts.acpi-ignore
-case "$code" in
- # Soft buttons 3 & 4 and Fn-Space/SHE are special.
- # They're always reported as hotkeys.
- # This will probably break when button events are added for these keys.
- 0000001[cd]|00000039)
- ;;
- *)
- if test -f "$ACPITEST"; then
- read acpi <"$ACPITEST"
- else
- acpiwrite=$(test "x$1" = x- && echo hotkey || echo -)
- fi
- test "$1" = "$acpi" && exit 0
- ;;
-esac
-
-seen_hotkey() { test "$acpi" = button; }
-
handle_mute_toggle() {
$PKG_DIR/volume.sh toggle
}
@@ -136,24 +113,6 @@ handle_gsm_toggle() {
fi
}
-# Handle events which we're handling differently on different models
-case $(cat /sys/class/dmi/id/product_name) in
- [79]*|1000H)
- case $code in
- ZOOM)
- code=0000001b # soft button 2
- ;;
- esac
- ;;
- *)
- case $code in
- ZOOM)
- code=00000038 # Fn-F4
- ;;
- esac
- ;;
-esac
-
case $code in
# Fn + key:
# <700/900-series key>/<1000-series key> - function
@@ -191,35 +150,35 @@ case $code in
;;
# F5/F8 - toggle VGA
- 0000003[012]|VMOD)
+ 0000003[012])
if [ "${FnF_VGATOGGLE}" != 'NONE' ]; then
${FnF_VGATOGGLE:-handle_vga_toggle}
fi
;;
# F6/F9 - 'task manager' key
- 00000012|PROG1)
+ 00000012)
if [ "${FnF_TASKMGR:-NONE}" != 'NONE' ]; then
$FnF_TASKMGR
fi
;;
# F7/F10 - mute/unmute speakers
- 00000013|MUTE)
+ 00000013)
if [ "${FnF_MUTE}" != 'NONE' ]; then
${FnF_MUTE:-handle_mute_toggle}
fi
;;
# F8/F11 - decrease volume
- 00000014|VOLDN)
+ 00000014)
if [ "${FnF_VOLUMEDOWN}" != 'NONE' ]; then
${FnF_VOLUMEDOWN:-handle_volume_down}
fi
;;
# F9/F12 - increase volume
- 00000015|VOLUP)
+ 00000015)
if [ "${FnF_VOLUMEUP}" != 'NONE' ]; then
${FnF_VOLUMEUP:-handle_volume_up}
fi
@@ -231,7 +190,7 @@ case $code in
# Silver keys, left to right
# Soft button 1
- 0000001a|SCRNLCK)
+ 0000001a)
if [ "${SOFTBTN1_ACTION}" != 'NONE' ]; then
${SOFTBTN1_ACTION:-handle_blank_screen}
fi
@@ -249,7 +208,6 @@ case $code in
if [ "${SOFTBTN3_ACTION}" != 'NONE' ]; then
${SOFTBTN3_ACTION:-handle_camera_toggle}
fi
- acpiwrite=
;;
# Soft button 4
@@ -257,7 +215,6 @@ case $code in
if [ "${SOFTBTN4_ACTION}" != 'NONE' ]; then
${SOFTBTN4_ACTION:-handle_bluetooth_toggle}
fi
- acpiwrite=
;;
# SHE button
@@ -265,9 +222,6 @@ case $code in
if [ "${SOFTBTNSHE_ACTION}" != 'NONE' ]; then
${SOFTBTNSHE_ACTION:-handle_shengine}
fi
- acpiwrite=
;;
esac
-
-test "$acpiwrite" = '' || echo "$acpiwrite" >"$ACPITEST"
diff --git a/etc/acpi/events/asus-eee-hotkey b/etc/acpi/events/asus-eee-hotkey
deleted file mode 100644
index 4226a8e..0000000
--- a/etc/acpi/events/asus-eee-hotkey
+++ /dev/null
@@ -1,2 +0,0 @@
-event=hotkey ATKD (0000001[0123456abcd]|0000003[012789])
-action=/usr/share/acpi-support/eeepc-acpi-scripts/hotkey.sh %e
diff --git a/etc/acpi/events/asus-eee-hotkey-button b/etc/acpi/events/asus-eee-hotkey-button
deleted file mode 100644
index 956b868..0000000
--- a/etc/acpi/events/asus-eee-hotkey-button
+++ /dev/null
@@ -1,2 +0,0 @@
-event=button/(wlan|zoom|mute|volume|prog|screenlock)
-action=/usr/share/acpi-support/eeepc-acpi-scripts/hotkey.sh - %e
diff --git a/etc/acpi/events/asus-eee-hotkey-video b/etc/acpi/events/asus-eee-hotkey-video
deleted file mode 100644
index bde1e9b..0000000
--- a/etc/acpi/events/asus-eee-hotkey-video
+++ /dev/null
@@ -1,2 +0,0 @@
-event=video/switchmode
-action=/usr/share/acpi-support/eeepc-acpi-scripts/hotkey.sh - %e
--
Maintenance of eeepc-acpi-scripts debian package
More information about the Debian-eeepc-commits
mailing list