[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, shengine, updated. 1.1.0-beta.1-22-g206c5c3
Darren Salt
linux at youmustbejoking.demon.co.uk
Wed Jun 10 17:18:13 UTC 2009
The following commit has been merged in the shengine branch:
commit 206c5c35ea95c613fac18fb0a1d9dcf7b355f739
Merge: ae1a86e185fbe6539bde4727c555f7f5e97bf5ba c445980b6dff73f1a1c729ce7c0490b09a2f2aee
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date: Sat May 30 19:10:57 2009 +0100
Merge branch 'master' into shengine
Conflicts:
debian/changelog
diff --combined debian/changelog
index 39ed6ff,8674f02..9811cd5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,9 +1,9 @@@
eeepc-acpi-scripts (1.1.1) unstable; urgency=low
+ [ Darren Salt ]
* Add support for Fn-F7 (on 10xx models). Default is screen blanking.
+ Add support for Fn-F3 (touchpad toggle on 10xx models).
+ (Closes: #528759)
* Rearrange hotkey handling a bit (no functional changes), fix comments
and document keys for which we don't yet have event codes.
* Configuration settings FnF6, FnF7, FnF8 and FnF9 are renamed to reflect
@@@ -10,11 -13,14 +13,17 @@@
* Alter the audio control blacklisting to allow for controls for which
(for example) muting only should be allowed.
* Add "Beep" to the audio control blacklist, but only for volume control.
+ * Make sure that, if some controls is unmuted due to volume level change,
+ all other relevant controls are unmuted.
+ * Fix a bashism in debian/rules.
+ * Add support for the 'super hybrid engine', which is accessible in kernel
+ 2.6.30-rc7 and later, and allow for automatic upclocking when on AC and
+ downclocking when on battery (default is not to do so).
- -- Darren Salt <linux at youmustbejoking.demon.co.uk> Sat, 25 Apr 2009 16:47:17 +0100
+ [ Raphael Geissert ]
+ * Allow fine-grained control over the lid-closing action.
+
+ -- Darren Salt <linux at youmustbejoking.demon.co.uk> Mon, 25 May 2009 11:25:50 +0100
eeepc-acpi-scripts (1.1.0) unstable; urgency=low
diff --combined debian/eeepc-acpi-scripts.default
index 3fe2cce,b8658d5..8fe4a7c
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@@ -62,6 -62,14 +62,14 @@@ SUSPEND_OPTIONS=--quirk-s3-bio
# screen.
LOCK_SCREEN_ON_SUSPEND='yes'
+ # Action to perform when the lid is closed.
+ # If left empty, or by specifying "suspend", it will suspend via the
+ # SUSPEND_METHOD, as specified above.
+ # To do nothing, set it to "nothing".
+ #
+ # Setting it to anything else will result in it being treated as a command.
+ LID_CLOSE_ACTION=
+
# try to load/unload the hci_usb module and use hcitool for checking
# bluetooth state when the bluetooth control node in
# /sys/devices/platform/bluetooth is not present
@@@ -84,8 -92,6 +92,8 @@@ BLUETOOTH_FALLBACK_TO_HCITOOL='yes
# - handle_volume_up
# - handle_volume_down
# Adjust volume level
+# - handle_shengine
+# Change 'super hybrid engine' setting
# - NONE
# Ignore the key
# - custom command
@@@ -112,13 -118,3 +120,13 @@@ FnF_VOLUMEDOWN='handle_volume_down
# F9/F12 - increase volume
FnF_VOLUMEUP='handle_volume_up'
+# Clocking options when on AC or battery
+# 0 = overclocked
+# 1 = standard
+# 2 = underclocked
+# '' = leave as is
+# PWR_CLOCK_AC should be '0', '1', or ''
+# PWR_CLOCK_BATTERY should be '1', '2', or ''
+# If one is '', so should the other else the state will only be changed one way
+PWR_CLOCK_AC=
+PWR_CLOCK_BATTERY=
diff --combined etc/acpi/actions/hotkey.sh
index e2efddc,6fc3f59..05b60c9
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@@ -67,27 -67,6 +67,27 @@@ handle_bluetooth_toggle()
fi
}
+handle_shengine() {
+ . /etc/acpi/lib/shengine.sh
+ if [ -e "$SHENGINE_CTL" ]; then
+ if [ "$1" = '' ]; then
+ cycle_shengine
+ else
+ set_shengine "$1"
+ fi
+ if [ "$2" != '' ]; then return; fi
+ case $(get_shengine) in
+ 0) notify super_hybrid_engine 'S. H. Engine: Performance'; ;;
+ 1) notify super_hybrid_engine 'S. H. Engine: Standard'; ;;
+ 2) notify super_hybrid_engine 'S. H. Engine: Power-saving'; ;;
+ 255) notify super_hybrid_engine 'S. H. Engine: Automatic'; ;;
+ *) notify error 'S. H. Engine unavailable'
+ esac
+ else
+ notify error 'S. H. Engine unavailable'
+ fi
+}
+
show_camera() {
if camera_is_on; then
notify camera 'Camera Enabled'
@@@ -135,6 -114,10 +135,10 @@@ case $code i
# --/F3 - touchpad toggle
00000037)
+ . /etc/acpi/lib/touchpad.sh
+ toggle_touchpad &&
+ notify touchpad 'Touchpad on' ||
+ notify touchpad 'Touchpad off'
;;
# --/F4 - resolution change
@@@ -152,7 -135,7 +156,7 @@@
# --/F7 - backlight off
00000016)
- if [ "${FnF_BACKLIGHTOFF:-handle_blank_screen}" != 'NONE' ]; then
+ if [ "${FnF_BACKLIGHTOFF}" != 'NONE' ]; then
${FnF_BACKLIGHTOFF:-handle_blank_screen}
fi
;;
@@@ -171,21 -154,21 +175,21 @@@
# F7/F10 - mute/unmute speakers
00000013)
- if [ "${FnF_MUTE:-handle_mute_toggle}" != 'NONE' ]; then
+ if [ "${FnF_MUTE}" != 'NONE' ]; then
${FnF_MUTE:-handle_mute_toggle}
fi
;;
# F8/F11 - decrease volume
00000014)
- if [ "${FnF_VOLUMEDOWN:-handle_volume_down}" != 'NONE' ]; then
+ if [ "${FnF_VOLUMEDOWN}" != 'NONE' ]; then
${FnF_VOLUMEDOWN:-handle_volume_down}
fi
;;
# F9/F12 - increase volume
00000015)
- if [ "${FnF_VOLUMEUP:-handle_volume_up}" != 'NONE' ]; then
+ if [ "${FnF_VOLUMEUP}" != 'NONE' ]; then
${FnF_VOLUMEUP:-handle_volume_up}
fi
;;
@@@ -197,7 -180,7 +201,7 @@@
# Soft button 1
0000001a)
- if [ "${SOFTBTN1_ACTION:-handle_blank_screen}" != 'NONE' ]; then
+ if [ "${SOFTBTN1_ACTION}" != 'NONE' ]; then
${SOFTBTN1_ACTION:-handle_blank_screen}
fi
;;
@@@ -211,16 -194,15 +215,16 @@@
# Soft button 3
0000001c)
- if [ "${SOFTBTN3_ACTION:-handle_camera_toggle}" != 'NONE' ]; then
+ if [ "${SOFTBTN3_ACTION}" != 'NONE' ]; then
${SOFTBTN3_ACTION:-handle_camera_toggle}
fi
;;
# Soft button 4
0000001d)
- if [ "${SOFTBTN4_ACTION:-handle_bluetooth_toggle}" != 'NONE' ]; then
+ if [ "${SOFTBTN4_ACTION}" != 'NONE' ]; then
${SOFTBTN4_ACTION:-handle_bluetooth_toggle}
fi
;;
+
esac
--
Maintenance of eeepc-acpi-scripts debian package
More information about the Debian-eeepc-commits
mailing list