[Pkg-utopia-commits] r1257 - in packages/unstable/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-07 00:54:48 +0000 (Wed, 07 Mar 2007)
New Revision: 1257

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/patches/02_powerscripts.patch
Log:
Add support for pm-utils and prefer it over other solutions. This should smooth the transition to hal-0.5.9


Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2007-03-07 00:48:16 UTC (rev 1256)
+++ packages/unstable/hal/debian/changelog	2007-03-07 00:54:48 UTC (rev 1257)
@@ -17,6 +17,9 @@
     debian/patches/55_nonpolkit-mount-policy.patch.
     This fixes the problem that local devices are not shown in nautilus.
     (Closes: #394155, #395169, #409879) 
+  * debian/patches/02_powerscripts.patch
+    - Add support for pm-utils and prefer it over other solutions. This is in
+      anticipation of hal-0.5.9, where pm-utils will be the preferred backend.
 
  -- Michael Biebl <biebl at debian.org>  Mon,  5 Mar 2007 22:20:55 +0100
 

Modified: packages/unstable/hal/debian/patches/02_powerscripts.patch
===================================================================
--- packages/unstable/hal/debian/patches/02_powerscripts.patch	2007-03-07 00:48:16 UTC (rev 1256)
+++ packages/unstable/hal/debian/patches/02_powerscripts.patch	2007-03-07 00:54:48 UTC (rev 1257)
@@ -1,7 +1,24 @@
-diff -u hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux
+diff -u hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux build-tree/hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux
 --- hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2006-11-11 14:50:21.000000000 +0100
-@@ -52,6 +52,14 @@
++++ build-tree/hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2007-03-06 02:02:12.000000000 +0100
+@@ -39,19 +39,27 @@
+ 
+ #Other distros just need to have *any* tools installed
+ else
+-	if [ -x "/usr/bin/powersave" ] ; then
++	if [ -x "/usr/sbin/pm-hibernate" ] ; then
++		/usr/sbin/pm-hibernate
++		RET=$?
++	elif [ -x "/usr/bin/powersave" ] ; then
+ 	        $POWERSAVED_SUSPEND2DISK
+ 		RET=$?
+ 	elif [ -x "/usr/sbin/pmi" ] ; then
+ 		/usr/sbin/pmi action hibernate force
+ 		RET=$?
+-	elif [ -x "/usr/sbin/pm-hibernate" ] ; then
+-		/usr/sbin/pm-hibernate
+-		RET=$?
+ 	elif [ -x "/usr/sbin/hibernate" ] ; then
  		# Suspend2 tools installed
  		/usr/sbin/hibernate --force
  		RET=$?
@@ -16,10 +33,20 @@
  	elif [ -w "/sys/power/state" ] ; then
  		# Use the raw kernel sysfs interface
  		echo "disk" > /sys/power/state
-diff -u hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux
+diff -u hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux build-tree/hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux
 --- hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2006-11-11 14:51:21.000000000 +0100
-@@ -86,6 +86,17 @@
++++ build-tree/hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2007-03-06 02:02:01.000000000 +0100
+@@ -80,12 +80,26 @@
+ 
+ #Other distros just need to have *any* tools installed
+ else
+-	if [ -x "/usr/bin/powersave" ] ; then
++	if [ -x "/usr/sbin/pm-suspend" ] ; then
++		/usr/sbin/pm-suspend
++		RET=$?
++	elif [ -x "/usr/bin/powersave" ] ; then
+ 	    $POWERSAVED_SUSPEND2RAM
+ 	    RET=$?
  	elif [ -x "/usr/sbin/pmi" ] ; then
  	    /usr/sbin/pmi action suspend force
  	    RET=$?