[Debian-eeepc-devel] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. c06a88d0a4b20cc13c9dd0b2aac8bb027fd35687

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit c06a88d0a4b20cc13c9dd0b2aac8bb027fd35687
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sun Jun 29 17:53:59 2008 +0300

    add support for the new locations of wireless and brightness control files for 2.6.26 kernels. Closes: 488412. Thanks to Astrid S. de Wijn.

diff --git a/actions/suspend.sh b/actions/suspend.sh
index 393fd94..1576d81 100755
--- a/actions/suspend.sh
+++ b/actions/suspend.sh
@@ -7,7 +7,8 @@ if (runlevel | grep -q [06]) || (pidof '/sbin/shutdown' > /dev/null); then
     exit 0
 fi
 
-brn_control=/proc/acpi/asus/brn
+brn_control=/sys/class/backlight/eeepc/brightness
+[ -e $brn_control ] || brn_control=/proc/acpi/asus/brn # pre-2.6.26
 
 brightness=$(cat $brn_control)
 pm-suspend --quirk-s3-bios
diff --git a/actions/wireless.sh b/actions/wireless.sh
index 5cb1c52..9a094cc 100755
--- a/actions/wireless.sh
+++ b/actions/wireless.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-wlan_control=/proc/acpi/asus/wlan
+wlan_control=/sys/devices/platform/eeepc/wlan
+[ -e $wlan_control ] || wlan_control=/proc/acpi/asus/wlan # pre-2.6.26
 
 case $1 in
     on|enable)
diff --git a/debian/changelog b/debian/changelog
index 9afec40..ddce9ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eeepc-acpi-scripts (1.0.4) UNRELEASED; urgency=low
+
+  * add support for the new locations of wireless and brightness control files
+    for 2.6.26 kernels. Closes: 488412. Thanks to Astrid S. de Wijn.
+
+ -- Damyan Ivanov <dmn at debian.org>  Sun, 29 Jun 2008 17:51:48 +0300
+
 eeepc-acpi-scripts (1.0.3) unstable; urgency=low
 
   [ Nico Golde]

-- 
Maintenance of eeepc-acpi-scripts debian package