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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-08-15 14:02:26 +0000 (Tue, 15 Aug 2006)
New Revision: 947

Added:
   packages/unstable/hal/debian/patches/20_uswsusp.patch
   packages/unstable/hal/debian/patches/21_acpi_support.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/20_uswsusp.patch:
  - Added. Use uswsusp for suspend and hibernation if available. Patch by
  Tim Dijkstra. (Closes: #382183)
* debian/patches/21_acpi_support.patch:
  - Added. Use acpi-support for suspend and hibernation if available.
  (Closes: #381708)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-08-15 14:00:11 UTC (rev 946)
+++ packages/unstable/hal/debian/changelog	2006-08-15 14:02:26 UTC (rev 947)
@@ -43,6 +43,12 @@
   * debian/patches/07_suspend2.patch:
     - Updated. Don't try to use suspend2 to suspend a pmu machine, which can
     crash the machine. (Closes: #366008)
+  * debian/patches/20_uswsusp.patch:
+    - Added. Use uswsusp for suspend and hibernation if available. Patch by
+    Tim Dijkstra. (Closes: #382183)
+  * debian/patches/21_acpi_support.patch:
+    - Added. Use acpi-support for suspend and hibernation if available.
+    (Closes: #381708)
 
   [ Sebastian Dröge  ]
   * debian/pycompat,
@@ -53,7 +59,7 @@
     + Bump Standards-Version to 3.7.2
     + Add myself to Uploaders
 
- -- Sjoerd Simons <sjoerd at debian.org>  Tue, 15 Aug 2006 15:20:09 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 15 Aug 2006 15:45:35 +0200
 
 hal (0.5.7-2) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/20_uswsusp.patch
===================================================================
--- packages/unstable/hal/debian/patches/20_uswsusp.patch	2006-08-15 14:00:11 UTC (rev 946)
+++ packages/unstable/hal/debian/patches/20_uswsusp.patch	2006-08-15 14:02:26 UTC (rev 947)
@@ -0,0 +1,28 @@
+diff -u hal-0.5.7.1/tools/hal-system-power-suspend hal-0.5.7.1/tools/hal-system-power-suspend
+--- hal-0.5.7.1/tools/hal-system-power-suspend	2006-08-15 15:16:59.000000000 +0200
++++ hal-0.5.7.1/tools/hal-system-power-suspend	2006-08-15 15:33:55.000000000 +0200
+@@ -53,6 +53,9 @@
+ 	elif [ -x "/usr/sbin/pmi" ] ; then
+ 	    /usr/sbin/pmi action suspend force
+ 	    RET=$?
++	elif [ -x "/usr/sbin/s2both" ] ; then
++	    /usr/sbin/s2both
++	    RET=$?
+ 	elif  [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then
+ 		#PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
+ 		hal-system-power-pmu sleep
+only in patch2:
+unchanged:
+--- hal-0.5.7/tools/hal-system-power-hibernate	2006-03-01 15:03:53.000000000 +0100
++++ hal-0.5.7.1/tools/hal-system-power-hibernate	2006-08-15 15:33:55.000000000 +0200
+@@ -43,6 +43,10 @@
+ 		# Suspend2 tools installed
+ 		/usr/sbin/hibernate --force
+ 		RET=$?
++	elif [ -x "/usr/sbin/s2disk" ] ; then
++		# uswsusp tools installed
++		/usr/sbin/s2disk
++		RET=$?
+ 	elif [ -w "/sys/power/state" ] &&
+        [  "$HAL_PROP_POWER_MANAGEMENT_TYPE" != pmu ] ; then
+ 		# Use the raw kernel sysfs interface if possible (not on pmu yet)

Added: packages/unstable/hal/debian/patches/21_acpi_support.patch
===================================================================
--- packages/unstable/hal/debian/patches/21_acpi_support.patch	2006-08-15 14:00:11 UTC (rev 946)
+++ packages/unstable/hal/debian/patches/21_acpi_support.patch	2006-08-15 14:02:26 UTC (rev 947)
@@ -0,0 +1,28 @@
+diff -u hal-0.5.7.1/tools/hal-system-power-hibernate hal-0.5.7.1/tools/hal-system-power-hibernate
+--- hal-0.5.7.1/tools/hal-system-power-hibernate	2006-08-15 15:33:55.000000000 +0200
++++ hal-0.5.7.1/tools/hal-system-power-hibernate	2006-08-15 15:42:06.000000000 +0200
+@@ -47,6 +47,10 @@
+ 		# uswsusp tools installed
+ 		/usr/sbin/s2disk
+ 		RET=$?
++	elif [ -x "/etc/acpi/hibernate.sh" ] ; then
++		# acpi-support installed
++		/etc/acpi/hibernate.sh
++		RET=$?
+ 	elif [ -w "/sys/power/state" ] &&
+        [  "$HAL_PROP_POWER_MANAGEMENT_TYPE" != pmu ] ; then
+ 		# Use the raw kernel sysfs interface if possible (not on pmu yet)
+diff -u hal-0.5.7.1/tools/hal-system-power-suspend hal-0.5.7.1/tools/hal-system-power-suspend
+--- hal-0.5.7.1/tools/hal-system-power-suspend	2006-08-15 15:33:55.000000000 +0200
++++ hal-0.5.7.1/tools/hal-system-power-suspend	2006-08-15 15:39:57.000000000 +0200
+@@ -64,6 +64,10 @@
+ 		# Use hibernate configured for suspend-to-ram
+ 		/usr/sbin/hibernate -F/etc/hibernate/ram.conf
+ 		RET=$?
++	elif [ -x "/etc/acpi/sleep.sh" ] ; then
++		# Use acpi-support for suspend to ram 
++		/etc/acpi/sleep.sh
++		RET=$?
+ 	elif [ -w "/sys/power/state" ] ; then
+ 	    # Use the raw kernel sysfs interface
+ 	    echo "mem" > /sys/power/state