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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-03-05 21:11:25 +0000 (Sun, 05 Mar 2006)
New Revision: 735

Modified:
   packages/unstable/hal/debian/patches/05_pmu_nohibernate.patch
Log:
Don't inlcude the patch in the patch

Modified: packages/unstable/hal/debian/patches/05_pmu_nohibernate.patch
===================================================================
--- packages/unstable/hal/debian/patches/05_pmu_nohibernate.patch	2006-03-05 21:03:47 UTC (rev 734)
+++ packages/unstable/hal/debian/patches/05_pmu_nohibernate.patch	2006-03-05 21:11:25 UTC (rev 735)
@@ -26,27 +26,3 @@
  	/* check for the presence of suspend2 */
  	if (access ("/proc/software_suspend", F_OK) == 0)
  		can_hibernate = TRUE;
-diff -ruN hal-0.5.7-old/pmucrash.patch hal-0.5.7/pmucrash.patch
---- hal-0.5.7-old/pmucrash.patch	1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.7/pmucrash.patch	2006-03-01 11:36:19.000000000 +0100
-@@ -0,0 +1,20 @@
-+--- osspec.c.orig	2006-03-01 11:32:31.000000000 +0100
-++++ osspec.c	2006-03-01 11:35:56.000000000 +0100
-+@@ -447,6 +447,7 @@
-+ 	unsigned int len;
-+ 	char *poweroptions;
-+ 	FILE *fp;
-++        const char* pmtype = NULL;
-+ 
-+ 	can_suspend = FALSE;
-+ 	can_hibernate = FALSE;
-+@@ -471,7 +472,8 @@
-+ 		can_hibernate = TRUE;
-+ 	free (poweroptions);
-+ 
-+-	if (!strcmp(hal_device_property_get_string(d,"power_management.type"), "pmu")) {
-++        pmtype = hal_device_property_get_string(d,"power_management.type");
-++	if (pmtype && !strcmp(pmtype, "pmu")) {
-+ 		/* Although /sys/power/state exists on pmu based machines, using it just
-+ 		 * crashes mine. Suspending works via the pmu though. So overriding what we
-+ 		 * just saw...