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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-11-11 14:15:05 +0100 (Sat, 11 Nov 2006)
New Revision: 1134

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/patches/02_powerscripts.patch
Log:
* debian/patches/02_powerscripts.patch
  + Prefer hibernate over uswsusp. (Closes: #397302)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-11-11 13:01:08 UTC (rev 1133)
+++ packages/unstable/hal/debian/changelog	2006-11-11 13:15:05 UTC (rev 1134)
@@ -16,8 +16,12 @@
       - Don't coredump utilities when hald is not running but print a usefull
         error message. GIT changeset c2053bf825cd9d81949d63ad83790a68310bb808
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Thu,  9 Nov 2006 23:48:31 +0100
+  [ Sjoerd Simons ]
+  * debian/patches/02_powerscripts.patch
+    + Prefer hibernate over uswsusp. (Closes: #397302)
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 11 Nov 2006 14:13:25 +0100
+
 hal (0.5.8.1-3) unstable; urgency=low
 
   * debian/control

Modified: packages/unstable/hal/debian/patches/02_powerscripts.patch
===================================================================
--- packages/unstable/hal/debian/patches/02_powerscripts.patch	2006-11-11 13:01:08 UTC (rev 1133)
+++ packages/unstable/hal/debian/patches/02_powerscripts.patch	2006-11-11 13:15:05 UTC (rev 1134)
@@ -6,14 +6,14 @@
  	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=$?
 +	elif [ -x "/usr/sbin/s2disk" ] ; then
 +		# uswsusp tools installed
 +		/usr/sbin/s2disk
 +		RET=$?
- 	elif [ -x "/usr/sbin/hibernate" ] ; then
- 		# Suspend2 tools installed
- 		/usr/sbin/hibernate --force
- 		RET=$?
 +	elif [ -x "/etc/acpi/hibernate.sh" ] ; then
 +		# acpi-support installed
 +		/etc/acpi/hibernate.sh force
@@ -28,13 +28,13 @@
  	elif [ -x "/usr/sbin/pmi" ] ; then
  	    /usr/sbin/pmi action suspend force
  	    RET=$?
-+	elif [ -x "/usr/sbin/s2ram" ] ; then
-+	    /usr/sbin/s2ram
-+	   RET=$?
 +	elif [ -x "/usr/sbin/hibernate" ] ; then
 +	    # Use hibernate configured for suspend-to-ram
 +	    /usr/sbin/hibernate -F/etc/hibernate/ram.conf
 +	    RET=$?
++	elif [ -x "/usr/sbin/s2ram" ] ; then
++	    /usr/sbin/s2ram
++	   RET=$?
 +	elif [ -x "/etc/acpi/sleep.sh" ] ; then
 +	    # Use acpi-support for suspend to ram 
 +	    /etc/acpi/sleep.sh force