[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-74-g83c9b5c

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 6500378c91d8ea0c08ab252222f1b4b922d44809
Author: Luca Niccoli <lultimouomo at gmail.com>
Date:   Fri Apr 23 15:53:14 2010 +0200

    Move SHE handling from acpid to pm-utils; call pm-utils if a power manager isn't running like acpi-support does
    
    Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>

diff --git a/debian/dirs b/debian/dirs
index ffb1f0e..8823008 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,6 +3,7 @@ etc/acpi/actions
 etc/acpi/events
 etc/acpi/lib
 etc/modprobe.d
+etc/pm/power.d
 lib/udev/rules.d
 usr/share/eeepc-acpi-scripts
 var/lib/eeepc-acpi-scripts
diff --git a/debian/preinst b/debian/preinst
index 25809df..2ddaddf 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -20,6 +20,11 @@ case "$1" in
         if dpkg --compare-versions "$2" le "1.0.11"; then
             prep_mv_conffile "/etc/modprobe.d/eeepc"
         fi
+        if dpkg --compare-versions "$2" le "1.1.10"; then
+            prep_mv_conffile "/etc/acpi/events/ac_adapter_inserted"
+            prep_mv_conffile "/etc/acpi/events/ac_adapter_removed"
+            prep_mv_conffile "/etc/acpi/actions/ac_adapter.sh"
+        fi
     ;;
 
     abort-upgrade)
diff --git a/debian/rules b/debian/rules
index db23e1d..9606a91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ install: build
 	install -m 0644 etc/acpi/events/* $(TMP)/etc/acpi/events
 	install -m 0644 etc/acpi/lib/* $(TMP)/etc/acpi/lib
 	install -m 0644 etc/modprobe.d/* $(TMP)/etc/modprobe.d
+	install -m 0755 etc/pm/power.d/* $(TMP)/etc/pm/power.d
 	install -m 0644 lib/udev/rules.d/* $(TMP)/lib/udev/rules.d
 	install -m 0755 lib/udev/[!r]* $(TMP)/lib/udev
 	install -m 0644 functions.sh $(TMP)/usr/share/$(PKG)/
diff --git a/etc/acpi/actions/power.sh b/etc/acpi/actions/power.sh
new file mode 100755
index 0000000..7e10fa6
--- /dev/null
+++ b/etc/acpi/actions/power.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+test -f /usr/share/acpi-support/key-constants || exit 0
+
+. /usr/share/acpi-support/policy-funcs
+
+if [ -z "$*" ] && [ `CheckPolicy` = 0 ]; then
+    exit;
+fi
+
+#pm-powersave $*
diff --git a/etc/acpi/events/ac b/etc/acpi/events/ac
new file mode 100644
index 0000000..2dd5a71
--- /dev/null
+++ b/etc/acpi/events/ac
@@ -0,0 +1,6 @@
+# /etc/acpi/events/ac
+# Called when the user connects ac power to us
+# 
+
+event=ac_adapter.*
+action=/etc/acpi/actions/power.sh
diff --git a/etc/acpi/events/ac_adapter_inserted b/etc/acpi/events/ac_adapter_inserted
deleted file mode 100644
index af9eb09..0000000
--- a/etc/acpi/events/ac_adapter_inserted
+++ /dev/null
@@ -1,2 +0,0 @@
-event=ac_adapter .* 0000008[01] 00000001
-action=/etc/acpi/actions/ac_adapter.sh %e
diff --git a/etc/acpi/events/ac_adapter_removed b/etc/acpi/events/ac_adapter_removed
deleted file mode 100644
index b05b617..0000000
--- a/etc/acpi/events/ac_adapter_removed
+++ /dev/null
@@ -1,2 +0,0 @@
-event=ac_adapter .* 0000008[01] 00000000
-action=/etc/acpi/actions/ac_adapter.sh %e
diff --git a/etc/acpi/actions/ac_adapter.sh b/etc/pm/power.d/SHE.sh
similarity index 91%
rename from etc/acpi/actions/ac_adapter.sh
rename to etc/pm/power.d/SHE.sh
index a2e4bc6..050b905 100755
--- a/etc/acpi/actions/ac_adapter.sh
+++ b/etc/pm/power.d/SHE.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# Handles EeePc Super Hybrid Engine
 # do nothing if package is removed
 PKG=eeepc-acpi-scripts
 FUNC_LIB=/usr/share/$PKG/functions.sh
@@ -16,11 +17,10 @@ if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi
 . $FUNC_LIB
 
 . /etc/acpi/lib/notify.sh
-code="$3 $4"
 
-case "$code" in
+case "$1" in
     # AC adapter present
-    0000008[01]\ 00000001)
+    false)
 	. /etc/acpi/lib/shengine.sh
 	if shengine_supported && [ "${SHENGINE_SETTING:-auto}" = auto ]; then
 	    PWR_CLOCK_AC="${PWR_CLOCK_AC:-0}"
@@ -31,7 +31,7 @@ case "$code" in
 	;;
 
     # AC adapter not present
-    0000008[01]\ 00000000)
+    true)
 	. /etc/acpi/lib/shengine.sh
 	if shengine_supported && [ "${SHENGINE_SETTING:-auto}" = auto ]; then
 	    PWR_CLOCK_BATTERY="${PWR_CLOCK_BATTERY:-$(($SHENGINE_LIMIT - 1))}"

-- 
Maintenance of eeepc-acpi-scripts debian package