[Pkg-utopia-commits] r1135 - packages/unstable/hal/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-11-11 14:55:35 +0100 (Sat, 11 Nov 2006)
New Revision: 1135

Modified:
   packages/unstable/hal/debian/patches/02_powerscripts.patch
Log:
If all else fails, just regenerate the patch instead of hand-editing

Modified: packages/unstable/hal/debian/patches/02_powerscripts.patch
===================================================================
--- packages/unstable/hal/debian/patches/02_powerscripts.patch	2006-11-11 13:15:05 UTC (rev 1134)
+++ packages/unstable/hal/debian/patches/02_powerscripts.patch	2006-11-11 13:55:35 UTC (rev 1135)
@@ -1,12 +1,7 @@
-Only in hal-0.5.8/tools/linux: .hal-system-power-suspend-linux.swp
-diff -aur hal-0.5.8.vanilla/tools/linux/hal-system-power-hibernate-linux hal-0.5.8/tools/linux/hal-system-power-hibernate-linux
---- hal-0.5.8.vanilla/tools/linux/hal-system-power-hibernate-linux	2006-09-11 23:56:40.000000000 +0200
-+++ hal-0.5.8/tools/linux/hal-system-power-hibernate-linux	2006-09-17 12:14:58.000000000 +0200
-@@ -48,10 +48,18 @@
- 	elif [ -x "/usr/sbin/pm-hibernate" ] ; then
- 		/usr/sbin/pm-hibernate
- 		RET=$?
- 	elif [ -x "/usr/sbin/hibernate" ] ; then
+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
+--- 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 @@
  		# Suspend2 tools installed
  		/usr/sbin/hibernate --force
  		RET=$?
@@ -21,9 +16,9 @@
  	elif [ -w "/sys/power/state" ] ; then
  		# Use the raw kernel sysfs interface
  		echo "disk" > /sys/power/state
-diff -aur hal-0.5.8.vanilla/tools/linux/hal-system-power-suspend-linux hal-0.5.8/tools/linux/hal-system-power-suspend-linux
---- hal-0.5.8.vanilla/tools/linux/hal-system-power-suspend-linux	2006-09-11 23:56:40.000000000 +0200
-+++ hal-0.5.8/tools/linux/hal-system-power-suspend-linux	2006-09-17 12:12:04.000000000 +0200
+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
+--- 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 @@
  	elif [ -x "/usr/sbin/pmi" ] ; then
  	    /usr/sbin/pmi action suspend force