diff -Nru acpi-support-0.105/asus-wireless-2.sh acpi-support-0.106/asus-wireless-2.sh --- acpi-support-0.105/asus-wireless-2.sh 1970-01-01 01:00:00.000000000 +0100 +++ acpi-support-0.106/asus-wireless-2.sh 2008-02-19 00:43:43.000000000 +0100 @@ -0,0 +1,14 @@ +#!/bin/bash + +. /usr/share/acpi-support/state-funcs + +ON_VALUE="e" +OFF_VALUE="f" + +CHARACTER_POSITION="8" + +HOTKEY_VALUE=`echo "$3"| cut -b "$CHARACTER_POSITION"` + +if ( isAnyWirelessPoweredOn && [ "$HOTKEY_VALUE" = "$OFF_VALUE" ] ) || ( ! isAnyWirelessPoweredOn && [ "$HOTKEY_VALUE" = "$ON_VALUE" ] ) ; then + toggleAllWirelessStates; +fi diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/debian/changelog /tmp/4KcyXkG3P3/acpi-support-0.106/debian/changelog --- acpi-support-0.105/debian/changelog 2008-01-13 00:53:21.000000000 +0100 +++ acpi-support-0.106/debian/changelog 2008-02-21 00:24:11.000000000 +0100 @@ -1,3 +1,34 @@ +acpi-support (0.106) hardy; urgency=low + + * Cherrypicked bugfix patches from Launchpad (LP: #193842) + * ibm-wireless.sh: Add better behavior & fix for bluetooth with Lenovo + Thinkpads; patch from Jerone Young (LP: #183682) + * lib/state-funcs: make wireless led work with asus-laptop (the new module); + patch from Nicolò Chieffo (LP: #189889) + * lib/state-funcs: change isAnyWirelessPoweredOn() according to the + removal of the old status kernel interface; patch from Nicolò Chieffo + (LP: #180598) + * Add events/asus-video to support asus switch video hotkey; patch from + Nicolò Chieffo (LP: #138228) + * events/asus-wireless-2, asus-wireless-2.sh: + Support Fn+F2 on Asus A8Js; patch from Matteo Collina (LP: #105929) + * Fix the value range in sonybright.sh (0-7 instead of 1-8); patch from unggnu + (LP: #136380) + * "lib/FUJITSU SIEMENS.config": + - Enable suspend for Fujitsu-Siemens C1110 (LP: #52970) + - Enable STR for Fujitsu-Siemens Lifebook S7020, S7110 + * resume.d/50-time.sh, suspend.d/88-time.sh: + Fix handling of hardware clock before/after suspend; patch from Rodrigo + Novo (LP: #36815) + * events/asus-*: Fix event key names for ASUS (HOTK); patch from + Jeroen van der Vegt (LP: #25784) + * Fix names in comments for events/panasonic-{mute,volume-down,volume-up} + * debian/rules, README.toshiba: Drop toshiba_acpi.modprobe, which only + contained an invalid/obsolete option "hotkeys_over_acpi" (LP: #180678) + * debian/control: Standards-Version 3.7.3 + + -- Daniel Hahler Thu, 21 Feb 2008 00:23:36 +0100 + acpi-support (0.105) hardy; urgency=low * Fix screenblank for KDE by using a dcop call diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/debian/control /tmp/4KcyXkG3P3/acpi-support-0.106/debian/control --- acpi-support-0.105/debian/control 2007-11-10 11:23:22.000000000 +0100 +++ acpi-support-0.106/debian/control 2008-02-19 00:48:38.000000000 +0100 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu Core developers XSBC-Original-Maintainer: Matthew Garrett -Build-Depends: debhelper (>=4.1.16) -Standards-Version: 3.6.1.0 +Build-Depends: debhelper (>= 4.1.16) +Standards-Version: 3.7.3 Package: acpi-support Architecture: i386 amd64 ia64 lpia diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/debian/rules /tmp/4KcyXkG3P3/acpi-support-0.106/debian/rules --- acpi-support-0.105/debian/rules 2007-07-15 18:28:35.000000000 +0200 +++ acpi-support-0.106/debian/rules 2008-02-19 02:12:31.000000000 +0100 @@ -40,7 +40,6 @@ install -m 755 $$file debian/acpi-support/etc/acpi/;\ done install -m 644 acpi-support debian/acpi-support/etc/default/; - install -m 644 toshiba_acpi.modprobe debian/acpi-support/etc/modprobe.d/; install -m 644 thinkpad_acpi.modprobe debian/acpi-support/etc/modprobe.d/; install -m 755 vbesave debian/acpi-support/etc/init.d/vbesave install -m 755 acpi_fakekey debian/acpi-support/usr/bin/acpi_fakekey diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-internet /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-internet --- acpi-support-0.105/events/asus-internet 2005-08-22 22:04:38.000000000 +0200 +++ acpi-support-0.106/events/asus-internet 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the internet button and calls # /etc/acpi/hotkey.sh for further processing. -event=hotkey ATKD 00000051 +event=hotkey (ATKD|HOTK) 00000051 action=/etc/acpi/webbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-lock /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-lock --- acpi-support-0.105/events/asus-lock 2006-02-15 17:55:22.000000000 +0100 +++ acpi-support-0.106/events/asus-lock 2008-02-19 01:30:00.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the power management button and calls # /etc/acpi/lockbtn.sh for further processing. -event=hotkey ATKD 0000005c +event=hotkey (ATKD|HOTK) 0000005c action=/etc/acpi/lockbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-mail /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-mail --- acpi-support-0.105/events/asus-mail 2005-08-22 22:05:18.000000000 +0200 +++ acpi-support-0.106/events/asus-mail 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the mail button and calls # /etc/acpi/hotkey.sh for further processing. -event=hotkey ATKD 00000050 +event=hotkey (ATKD|HOTK) 00000050 action=/etc/acpi/mailbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-media-next /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-media-next --- acpi-support-0.105/events/asus-media-next 2005-08-22 22:01:51.000000000 +0200 +++ acpi-support-0.106/events/asus-media-next 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the next media button and calls # /etc/acpi/media.sh for further processing. -event=hotkey ATKD 00000041 +event=hotkey (ATKD|HOTK) 00000041 action=/etc/acpi/nextbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-media-play-pause /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-media-play-pause --- acpi-support-0.105/events/asus-media-play-pause 2005-08-22 22:02:13.000000000 +0200 +++ acpi-support-0.106/events/asus-media-play-pause 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the play/pause media button and calls # /etc/acpi/media.sh for further processing. -event=hotkey ATKD 00000045 +event=hotkey (ATKD|HOTK) 00000045 action=/etc/acpi/playbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-media-prev /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-media-prev --- acpi-support-0.105/events/asus-media-prev 2005-08-22 22:02:45.000000000 +0200 +++ acpi-support-0.106/events/asus-media-prev 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the previous media button and calls # /etc/acpi/media.sh for further processing. -event=hotkey ATKD 00000040 +event=hotkey (ATKD|HOTK) 00000040 action=/etc/acpi/prevbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-media-stop /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-media-stop --- acpi-support-0.105/events/asus-media-stop 2005-08-22 22:02:55.000000000 +0200 +++ acpi-support-0.106/events/asus-media-stop 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the stop media button and calls # /etc/acpi/media.sh for further processing. -event=hotkey ATKD 00000043 +event=hotkey (ATKD|HOTK) 00000043 action=/etc/acpi/stopbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-video /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-video --- acpi-support-0.105/events/asus-video 1970-01-01 01:00:00.000000000 +0100 +++ acpi-support-0.106/events/asus-video 2008-02-19 00:31:27.000000000 +0100 @@ -0,0 +1,5 @@ +event=hotkey ATKD 0000006[123] +action=/etc/acpi/videobtn.sh +# /etc/acpi/events/asus-video +# This is called when the user presses the video button. + diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-volume-down /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-volume-down --- acpi-support-0.105/events/asus-volume-down 2005-08-28 18:38:26.000000000 +0200 +++ acpi-support-0.106/events/asus-volume-down 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the volume down button and calls # /etc/acpi/volume.sh for further processing. -event=hotkey ATKD 00000031 +event=hotkey (ATKD|HOTK) 00000031 action=/etc/acpi/voldownbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-volume-mute /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-volume-mute --- acpi-support-0.105/events/asus-volume-mute 2005-08-22 22:01:58.000000000 +0200 +++ acpi-support-0.106/events/asus-volume-mute 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the mute button and calls # /etc/acpi/volume.sh for further processing. -event=hotkey ATKD 00000032 +event=hotkey (ATKD|HOTK) 00000032 action=/etc/acpi/mutebtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-volume-up /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-volume-up --- acpi-support-0.105/events/asus-volume-up 2005-08-28 18:38:16.000000000 +0200 +++ acpi-support-0.106/events/asus-volume-up 2008-02-19 01:28:26.000000000 +0100 @@ -2,5 +2,5 @@ # This is called when the user presses the volume up button and calls # /etc/acpi/volume.sh for further processing. -event=hotkey ATKD 00000030 +event=hotkey (ATKD|HOTK) 00000030 action=/etc/acpi/volupbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/asus-wireless-2 /tmp/4KcyXkG3P3/acpi-support-0.106/events/asus-wireless-2 --- acpi-support-0.105/events/asus-wireless-2 1970-01-01 01:00:00.000000000 +0100 +++ acpi-support-0.106/events/asus-wireless-2 2008-02-19 00:43:43.000000000 +0100 @@ -0,0 +1,6 @@ +# /etc/acpi/events/asus-wireless +# This is called when the user presses the wireless button and calls +# /etc/acpi/wireless.sh for further processing. + +event=hotkey ATKD 0000005[ef] +action=/etc/acpi/asus-wireless-2.sh %e diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/panasonic-mute /tmp/4KcyXkG3P3/acpi-support-0.106/events/panasonic-mute --- acpi-support-0.105/events/panasonic-mute 2007-08-31 04:16:50.000000000 +0200 +++ acpi-support-0.106/events/panasonic-mute 2008-02-19 01:06:24.000000000 +0100 @@ -1,3 +1,3 @@ -# /etc/acpi/events/panasonic-brightness-up +# /etc/acpi/events/panasonic-mute event=pcc HKEY 00000080 00000084 action=/etc/acpi/mutebtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/panasonic-volume-down /tmp/4KcyXkG3P3/acpi-support-0.106/events/panasonic-volume-down --- acpi-support-0.105/events/panasonic-volume-down 2007-08-31 04:16:50.000000000 +0200 +++ acpi-support-0.106/events/panasonic-volume-down 2008-02-19 01:06:24.000000000 +0100 @@ -1,3 +1,3 @@ -# /etc/acpi/events/panasonic-brightness-up +# /etc/acpi/events/panasonic-volume-down event=pcc HKEY 00000080 00000085 action=/etc/acpi/voldownbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/events/panasonic-volume-up /tmp/4KcyXkG3P3/acpi-support-0.106/events/panasonic-volume-up --- acpi-support-0.105/events/panasonic-volume-up 2007-08-31 04:16:50.000000000 +0200 +++ acpi-support-0.106/events/panasonic-volume-up 2008-02-19 01:06:24.000000000 +0100 @@ -1,3 +1,3 @@ -# /etc/acpi/events/panasonic-brightness-up +# /etc/acpi/events/panasonic-volume-up event=pcc HKEY 00000080 00000086 action=/etc/acpi/volupbtn.sh diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/ibm-wireless.sh /tmp/4KcyXkG3P3/acpi-support-0.106/ibm-wireless.sh --- acpi-support-0.105/ibm-wireless.sh 2007-03-26 02:03:49.000000000 +0200 +++ acpi-support-0.106/ibm-wireless.sh 2008-02-19 02:08:02.000000000 +0100 @@ -3,24 +3,43 @@ . /usr/share/acpi-support/state-funcs +manufacturer=`dmidecode --string system-manufacturer` BLUETOOTH=/proc/acpi/ibm/bluetooth if [ -r $BLUETOOTH ]; then - grep -q disabled $BLUETOOTH + grep -i -n1 -q disabled $BLUETOOTH bluetooth_state=$? fi -# Note that this always alters the state of the wireless! -toggleAllWirelessStates; +case "$manufacturer" in + LENOVO*) + #if you are Lenovo Thinkpad + #All Lenovo laptops now have an rf_kill swith + #for wireless cards. So only manipulate bluetooh. + if [ -w $BLUETOOTH ]; then + if [ "$bluetooth_state" = 0 ]; then + echo enable > $BLUETOOTH; + else + echo disable > $BLUETOOTH; + fi + fi + ;; + *) + #For all other IBM manufactured Thinkpads + + # Note that this always alters the state of the wireless! + toggleAllWirelessStates; -# Sequence is Both on, Bluetooth only, Wireless only, Both off -if ! isAnyWirelessPoweredOn; then - # Wireless was turned off - if [ -w $BLUETOOTH ]; then - if [ "$bluetooth_state" = 0 ]; then - echo enable > $BLUETOOTH; - else - echo disable > $BLUETOOTH + # Sequence is Both on, Bluetooth only, Wireless only, Both off + if ! isAnyWirelessPoweredOn; then + # Wireless was turned off + if [ -w $BLUETOOTH ]; then + if [ "$bluetooth_state" = 0 ]; then + echo enable > $BLUETOOTH; + else + echo disable > $BLUETOOTH + fi + fi fi - fi -fi + ;; +esac diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/lib/FUJITSU SIEMENS.config /tmp/4KcyXkG3P3/acpi-support-0.106/lib/FUJITSU SIEMENS.config --- acpi-support-0.105/lib/FUJITSU SIEMENS.config 2007-08-31 05:13:34.000000000 +0200 +++ acpi-support-0.106/lib/FUJITSU SIEMENS.config 2008-02-19 01:14:55.000000000 +0100 @@ -16,13 +16,16 @@ SAVE_VIDEO_PCI_STATE=true ACPI_SLEEP=true ;; - "LIFEBOOK S7110"*) + "LIFEBOOK S7110"*|"LifeBook S7110"*)) SAVE_VIDEO_PCI_STATE=true ACPI_SLEEP=true ;; "LIFEBOOK S6120"*) ACPI_SLEEP=true ;; + "LIFEBOOK C1110"*) + ACPI_SLEEP=true + ;; "LIFEBOOK P7010"*) ACPI_SLEEP=true ;; diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/lib/state-funcs /tmp/4KcyXkG3P3/acpi-support-0.106/lib/state-funcs --- acpi-support-0.105/lib/state-funcs 2007-03-26 02:31:01.000000000 +0200 +++ acpi-support-0.106/lib/state-funcs 2008-02-19 00:28:34.000000000 +0100 @@ -6,19 +6,21 @@ isAnyWirelessPoweredOn() { for DEVICE in /sys/class/net/* ; do - if [ -d $DEVICE/wireless -a -r $DEVICE/device/power/state ] ; then - # If any of the wireless devices are turned on then return success - if [ "`cat $DEVICE/device/power/state`" -eq 0 ] ; then - # Check if 'rf_kill' disagrees - if [ -r $DEVICE/device/rf_kill ] ; then - if [ "`cat $DEVICE/device/rf_kill`" -eq 0 ] ; then - # And rf_kill has the radio on + if [ -d $DEVICE/wireless ] ; then + # the initial status is 0 which means that the interface is thought as disabled + # if it is found enabled intead the status will be put to 1 + STATUS="0" + if [ -r $DEVICE/device/power/state ] && [ "`cat $DEVICE/device/power/state`" -ne 0 ]; then + STATUS="1" + fi + if [ -r $DEVICE/device/rf_kill ] && [ "`cat $DEVICE/device/rf_kill`" -ne 0 ] ; then + STATUS="1" + fi + + if [ "$STATUS" -eq "0" ]; then + # found an enabled interface, returning success return 0 - fi - else - return 0 fi - fi fi done # otherwise return failure @@ -70,4 +72,5 @@ { action=`test "$1" -ne 0 && echo 1 || echo 0` test -w /proc/acpi/asus/wled && echo -n "$action" > /proc/acpi/asus/wled + test -w /sys/devices/platform/asus-laptop/wlan && echo -n "$action" > /sys/devices/platform/asus-laptop/wlan } diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/README.toshiba /tmp/4KcyXkG3P3/acpi-support-0.106/README.toshiba --- acpi-support-0.105/README.toshiba 2005-08-22 21:00:45.000000000 +0200 +++ acpi-support-0.106/README.toshiba 2008-02-19 02:13:26.000000000 +0100 @@ -38,26 +38,22 @@ (Don't worry if you get an error at this point) -3. create the configuration file - # cd /etc/modprobe.d - # cp /usr/share/doc/acpi-support/toshiba_acpi.modprobe . - -4. attempt to load the toshiba support module again +3. attempt to load the toshiba support module again # modprobe toshiba_acpi -5. check that the module loaded okay and enabled the hotkey support +4. check that the module loaded okay and enabled the hotkey support # ps ax | grep ktoshkeyd If you get no output from that command then the installation failed and you should seek support on the ubuntu-users mailing list. -6. ensure that the hotkey support is now working +5. ensure that the hotkey support is now working Try pressing Fn+ Your brightness should change appropriately. Again if you see no difference then seek support on the ubuntu-users mailinglist. -7. ensure that the module will be loaded on boot +6. ensure that the module will be loaded on boot # grep toshiba_acpi /etc/modules if you see no output from that command you should do: diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/resume.d/50-time.sh /tmp/4KcyXkG3P3/acpi-support-0.106/resume.d/50-time.sh --- acpi-support-0.105/resume.d/50-time.sh 2006-04-21 16:13:54.000000000 +0200 +++ acpi-support-0.106/resume.d/50-time.sh 2008-02-19 01:22:30.000000000 +0100 @@ -1,5 +1,7 @@ #!/bin/sh -# Reset the time -hwclock --hctosys +# Load the HWClock state +if [ -x /etc/init.d/hwclock.sh ]; then + /etc/init.d/hwclock.sh start +fi diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/sonybright.sh /tmp/4KcyXkG3P3/acpi-support-0.106/sonybright.sh --- acpi-support-0.105/sonybright.sh 2007-08-31 05:19:21.000000000 +0200 +++ acpi-support-0.106/sonybright.sh 2008-02-19 00:49:26.000000000 +0100 @@ -1,13 +1,13 @@ #!/bin/bash -BRIGHTNESS=$(cat /sys/class/backlight/sony/actual_brightness) +BRIGHTNESS=$(cat /sys/class/backlight/sony/brightness) -if [ "$BRIGHTNESS" -gt 8 ]; then - BRIGHTNESS=1 +if [ "$BRIGHTNESS" -gt 7 ]; then + BRIGHTNESS=0 fi if [ "x$1" = "xdown" ]; then - if [ "x$BRIGHTNESS" != "x1" ]; then + if [ "x$BRIGHTNESS" != "x0" ]; then BRIGHTNESS=$(( $BRIGHTNESS - 1 )) echo $BRIGHTNESS > /sys/class/backlight/sony/brightness else @@ -16,7 +16,7 @@ # Recent nvidia Sonys have ACPI methods that do nothing. Thanks, Sony. [ -x /usr/bin/smartdimmer ] && smartdimmer -d 2>/dev/null elif [ "x$1" = "xup" ]; then - if [ "x$BRIGHTNESS" != "x8" ]; then + if [ "x$BRIGHTNESS" != "x7" ]; then BRIGHTNESS=$(( $BRIGHTNESS + 1 )) echo $BRIGHTNESS > /sys/class/backlight/sony/brightness fi diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/suspend.d/88-time.sh /tmp/4KcyXkG3P3/acpi-support-0.106/suspend.d/88-time.sh --- acpi-support-0.105/suspend.d/88-time.sh 1970-01-01 01:00:00.000000000 +0100 +++ acpi-support-0.106/suspend.d/88-time.sh 2008-02-19 01:22:30.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/sh + +# Save the HWClock state +if [ -x /etc/init.d/hwclock.sh ]; then + /etc/init.d/hwclock.sh stop +fi + diff -Nru /tmp/bxDDLQJhMe/acpi-support-0.105/toshiba_acpi.modprobe /tmp/4KcyXkG3P3/acpi-support-0.106/toshiba_acpi.modprobe --- acpi-support-0.105/toshiba_acpi.modprobe 2005-08-22 21:00:45.000000000 +0200 +++ acpi-support-0.106/toshiba_acpi.modprobe 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -options toshiba_acpi hotkeys_over_acpi=1