[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.1-12-ge5cc6d0

Fri Jul 10 00:12:33 UTC 2009

The following commit has been merged in the master branch:
commit e5cc6d08c5bb2739d589cbd88dbc58a48e1be92e
Merge: 6c3297235b018a0697e20224be5ced861c759b32 827622be7ee21ebaaa49c123c2baed13dd070604
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Fri Jul 10 01:09:49 2009 +0100

    Merge branch 'shengine'

diff --combined debian/changelog
index 79ffa51,daf4793..f5d5e69

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,3 +1,11 @@@
 +eeepc-acpi-scripts (1.1.2) UNRELEASED; urgency=low
 +
 +  [ Darren Salt ]
 +  * Add an option for preferring to use the 'Master' control for volume
 +    control & muting. Off by default; normally takes effect while booting.
 +
 + -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Thu, 09 Jul 2009 22:56:19 +0100
 +
  eeepc-acpi-scripts (1.1.1) unstable; urgency=low
  
    [ Darren Salt ]
@@@ -24,25 -16,14 +24,28 @@@
    * 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 fastest/slowest).
  
    [ Raphael Geissert ]
    * Allow fine-grained control over the lid-closing action.
 +  * Make init script depend on $remote_fs, we use /usr
 +  * Add support for OSD notifications via kdialog (Closes: #519671)
 +    - Thanks to Gernot Pansy <pansyg at gmx.at> for the patch
 +  * Bump standards-version, no change needed
 +  * Simplify rules file
 +  * Use su instead of sudo to avoid another dependency
 +  * Add myself to uploaders
 +
 +  [ Tanguy Ortolo ]
 +  * Fix "[ -e $foo ]" where foo may be empty. (Closes: #532631)
 +
 +  [ Santi Béjar]
 +  * Add support for KMS in vga-toggle: when KMS (kernel mode setting) is
 +    used the output names have a number in the end (VGA1 and LVDS1).
  
 - -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Mon, 25 May 2009 11:25:50 +0100
 + -- Raphael Geissert <geissert at debian.org>  Thu, 09 Jul 2009 14:19:45 -0500
  
  eeepc-acpi-scripts (1.1.0) unstable; urgency=low
  
diff --combined debian/eeepc-acpi-scripts.default
index a306387,36b4f60..1fe5df4
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@@ -20,10 -20,6 +20,10 @@@ SOUND_SWITCH
  # pswitch capabilities only:
  SOUND_SWITCH_EXCLUSIVE=
  
 +# If auto-configuring, whether to prefer the Master control over others.
 +# Set to 'yes' to enable this. Normally takes effect on reboot.
 +SOUND_PREFER_MASTER=no
 +
  # Default volume level change.
  # You can specify the change in all ways supported by amixer, e.g.
  # raw value ('5'), percentage ('1.5625%') or decibels ('0.8dB').
@@@ -96,6 -92,8 +96,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
@@@ -122,3 -120,11 +124,11 @@@ 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
+ # (etc. as available)
+ # '' = fastest (AC) or slowest (battery)
+ PWR_CLOCK_AC=
+ PWR_CLOCK_BATTERY=
diff --combined debian/eeepc-acpi-scripts.init
index b5b2164,7b0d8a7..3476fab
--- a/debian/eeepc-acpi-scripts.init
+++ b/debian/eeepc-acpi-scripts.init
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh -e
  ### BEGIN INIT INFO
  # Provides:          eeepc-acpi-scripts
 -# Required-Start:    udev mountkernfs
 +# Required-Start:    udev mountkernfs $remote_fs
  # Required-Stop:     
  # Default-Start:     S
  # Default-Stop:
@@@ -89,6 -89,22 +89,22 @@@ case "$1" i
      # Done.
  
      log_action_end_msg 0
+ 
+     if [ -f /etc/default/eeepc-acpi-scripts -a -f /etc/acpi/lib/shengine.sh ]; then
+ 	log_action_begin_msg 'Setting super hybrid engine according to configuration'
+ 	. /etc/default/eeepc-acpi-scripts
+ 	. /etc/acpi/lib/shengine.sh
+ 	if [ "$SHENGINE_SETTING" != auto ]; then
+ 	    log_action_cont_msg '(manual)'
+ 	elif [ "$(cat /sys/class/power_supply/AC0/online 2>/dev/null)" = 0 ]; then
+ 	    log_action_cont_msg '(battery)'
+ 	    [ "${PWR_CLOCK_BATTERY:+x}" ] && set_shengine "$PWR_CLOCK_BATTERY" || :
+ 	else
+ 	    log_action_cont_msg '(AC)'
+ 	    [ "${PWR_CLOCK_AC:+x}" ] && set_shengine "$PWR_CLOCK_AC" || :
+ 	fi
+ 	log_action_end_msg $?
+     fi
      ;;
  
    stop)
diff --combined etc/acpi/actions/hotkey.sh
index b8a3c45,1de5077..a0da708
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@@ -4,7 -4,7 +4,7 @@@
  PKG=eeepc-acpi-scripts
  FUNC_LIB=/usr/share/$PKG/functions.sh
  DEFAULT=/etc/default/$PKG
 -[ -e $FUNC_LIB ] || exit 0
 +[ -e "$FUNC_LIB" ] || exit 0
  
  case $(runlevel) in
      *0|*6)
@@@ -59,7 -59,7 +59,7 @@@ show_bluetooth() 
  
  handle_bluetooth_toggle() {
      . /etc/acpi/lib/bluetooth.sh
 -    if [ -e $BT_CTL ] || [ "$BLUETOOTH_FALLBACK_TO_HCITOOL" = "yes" ]; then
 +    if [ -e "$BT_CTL" ] || [ "$BLUETOOTH_FALLBACK_TO_HCITOOL" = "yes" ]; then
  	toggle_bluetooth
  	show_bluetooth
      else
@@@ -77,7 -77,7 +77,7 @@@ show_camera() 
  
  handle_camera_toggle() {
      . /etc/acpi/lib/camera.sh
 -    if [ -e $CAM_CTL ]; then
 +    if [ -e "$CAM_CTL" ]; then
  	toggle_camera
  	show_camera
      else
@@@ -93,6 -93,11 +93,11 @@@ show_brightness() 
      notify brightness "Brightness $percent%" fast
  }
  
+ handle_shengine() {
+     . /etc/acpi/lib/shengine.sh
+     handle_shengine "$@"
+ }
+ 
  case $code in
      # Fn + key:
      # <700/900-series key>/<1000-series key> - function
@@@ -205,4 -210,5 +210,5 @@@
  	    ${SOFTBTN4_ACTION:-handle_bluetooth_toggle}
  	fi
  	;;
+ 
  esac

-- 
Maintenance of eeepc-acpi-scripts debian package

