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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-10-18 21:48:10 +0000 (Wed, 18 Oct 2006)
New Revision: 1068

Added:
   packages/unstable/hal/debian/patches/14_powe_suspend_linux_pmu_fix.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/14_powe_suspend_linux_pmu_fix.patch 
  - Added. Use the correct hal property to check the powermanagement type.

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-10-18 21:24:46 UTC (rev 1067)
+++ packages/unstable/hal/debian/changelog	2006-10-18 21:48:10 UTC (rev 1068)
@@ -8,9 +8,11 @@
     - Added. Fix some bashisms in the hal callout scripts (Closes: #393203)
   * debian/patches/02_powerscripts.patch
     - Updated. Use s2ram instead of s2both to let uswsusp suspend to ram
+  * debian/patches/14_powe_suspend_linux_pmu_fix.patch 
+    - Added. Use the correct hal property to check the powermanagement type.
     (Closes: #388558)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed, 18 Oct 2006 23:23:06 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 18 Oct 2006 23:45:26 +0200
 
 hal (0.5.8.1-1) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/14_powe_suspend_linux_pmu_fix.patch
===================================================================
--- packages/unstable/hal/debian/patches/14_powe_suspend_linux_pmu_fix.patch	                        (rev 0)
+++ packages/unstable/hal/debian/patches/14_powe_suspend_linux_pmu_fix.patch	2006-10-18 21:48:10 UTC (rev 1068)
@@ -0,0 +1,23 @@
+commit 188a8a5a7aa66ea48af96cda70bac300bb8bc9bc
+Author: Sjoerd Simons <sjoerd at luon.net>
+Date:   Wed Oct 18 23:44:35 2006 +0200
+
+    use $HAL_PROP_POWER_MANAGEMENT_TYPE to check the power management type
+    
+    HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD was used to check if the
+    powermanagement type, which isn't set on the root object. Using
+    HAL_PROP_POWER_MANAGEMENT_TYPE fixes suspend on pmu machines
+
+diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
+index 6842cc0..dad5198 100755
+--- a/tools/linux/hal-system-power-suspend-linux
++++ b/tools/linux/hal-system-power-suspend-linux
+@@ -19,7 +19,7 @@ unsupported() {
+ read seconds_to_sleep
+ 
+ #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
+-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
++if [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then
+ 	hal-system-power-pmu sleep
+ 	if [ $? -ne 0 ]; then
+ 		echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2