diff -u pm-utils-1.1.2.4/debian/changelog pm-utils-1.1.2.4/debian/changelog
--- pm-utils-1.1.2.4/debian/changelog
+++ pm-utils-1.1.2.4/debian/changelog
@@ -1,3 +1,13 @@
+pm-utils (1.1.2.4-1ubuntu8) intrepid; urgency=low
+
+  * debian/patches/10-uswsusp-fall-back-on-kernel.patch:
+    + Patched pm/module.d/uswsusp to fall back on kernel if s2ram not present
+      (Closes LP: #287374)
+  * debian/patches/25-pmu.patch:
+    + Refreshed to patch cleanly
+
+ -- Chow Loong Jin <hyperair@gmail.com>  Fri, 24 Oct 2008 03:45:55 +0800
+
 pm-utils (1.1.2.4-1ubuntu7) intrepid; urgency=low
 
   * Drop debian/patches/10-sleep-module-auto-detection.patch as we don't
diff -u pm-utils-1.1.2.4/debian/patches/25-pmu.patch pm-utils-1.1.2.4/debian/patches/25-pmu.patch
--- pm-utils-1.1.2.4/debian/patches/25-pmu.patch
+++ pm-utils-1.1.2.4/debian/patches/25-pmu.patch
@@ -1,7 +1,7 @@
-Index: pm-utils/pm/module.d/kernel
+Index: pm-utils-1.1.2.4/pm/module.d/kernel
 ===================================================================
---- pm-utils.orig/pm/module.d/kernel	2008-05-20 19:29:01.000000000 +0200
-+++ pm-utils/pm/module.d/kernel	2008-06-11 13:28:45.000000000 +0200
+--- pm-utils-1.1.2.4.orig/pm/module.d/kernel	2008-10-22 13:31:29.000000000 +0800
++++ pm-utils-1.1.2.4/pm/module.d/kernel	2008-10-22 13:39:58.000000000 +0800
 @@ -2,15 +2,15 @@
  
  check_suspend()
@@ -22,10 +22,10 @@
  	fi
  }
  
-Index: pm-utils/pm/module.d/tuxonice
+Index: pm-utils-1.1.2.4/pm/module.d/tuxonice
 ===================================================================
---- pm-utils.orig/pm/module.d/tuxonice	2008-05-20 19:29:01.000000000 +0200
-+++ pm-utils/pm/module.d/tuxonice	2008-06-11 13:28:45.000000000 +0200
+--- pm-utils-1.1.2.4.orig/pm/module.d/tuxonice	2008-10-22 13:31:29.000000000 +0800
++++ pm-utils-1.1.2.4/pm/module.d/tuxonice	2008-10-22 13:39:58.000000000 +0800
 @@ -13,15 +13,15 @@
  
  check_suspend()
@@ -46,23 +46,23 @@
  	fi
  }
  
-Index: pm-utils/pm/module.d/uswsusp
+Index: pm-utils-1.1.2.4/pm/module.d/uswsusp
 ===================================================================
---- pm-utils.orig/pm/module.d/uswsusp	2008-05-20 19:29:01.000000000 +0200
-+++ pm-utils/pm/module.d/uswsusp	2008-06-11 13:28:45.000000000 +0200
-@@ -36,7 +36,7 @@
- check_suspend()
- {
- 	command_exists s2ram || return 1
--	[ -c /dev/pmu ] || grep -q mem /sys/power/state
-+	grep -q mem /sys/power/state || [ -c /dev/pmu ]
- }
+--- pm-utils-1.1.2.4.orig/pm/module.d/uswsusp	2008-10-22 13:39:52.000000000 +0800
++++ pm-utils-1.1.2.4/pm/module.d/uswsusp	2008-10-22 13:40:34.000000000 +0800
+@@ -41,7 +41,7 @@
+ 	check_suspend()
+ 	{
+ 		command_exists s2ram || return 1
+-		[ -c /dev/pmu ] || grep -q mem /sys/power/state
++		grep -q mem /sys/power/state || [ -c /dev/pmu ]
+ 	}
  
- do_suspend()
-Index: pm-utils/pm/pm-functions.in
+ 	do_suspend()
+Index: pm-utils-1.1.2.4/pm/pm-functions.in
 ===================================================================
---- pm-utils.orig/pm/pm-functions.in	2008-06-11 13:28:40.000000000 +0200
-+++ pm-utils/pm/pm-functions.in	2008-06-11 13:28:45.000000000 +0200
+--- pm-utils-1.1.2.4.orig/pm/pm-functions.in	2008-10-22 13:31:29.000000000 +0800
++++ pm-utils-1.1.2.4/pm/pm-functions.in	2008-10-22 13:39:58.000000000 +0800
 @@ -199,6 +199,27 @@
  	exec > "$1" 2>&1
  }
@@ -92,2 +92,2 @@
- if [ "$SLEEP_MODULE" = auto ]; then
- 	# default is kernel
+ SLEEP_FUNCTIONS="${PM_UTILS_LIBDIR}/module.d/${SLEEP_MODULE}"
+ [ -f "${SLEEP_FUNCTIONS}" ] || { 
diff -u pm-utils-1.1.2.4/debian/patches/series pm-utils-1.1.2.4/debian/patches/series
--- pm-utils-1.1.2.4/debian/patches/series
+++ pm-utils-1.1.2.4/debian/patches/series
@@ -1,3 +1,4 @@
+10-uswsusp-fall-back-on-kernel.patch
 25-pmu.patch
 80-service.patch
 99-ubuntu-acpi-support-vbestate.patch
only in patch2:
unchanged:
--- pm-utils-1.1.2.4.orig/debian/patches/10-uswsusp-fall-back-on-kernel.patch
+++ pm-utils-1.1.2.4/debian/patches/10-uswsusp-fall-back-on-kernel.patch
@@ -0,0 +1,52 @@
+Index: pm-utils-1.1.2.4/pm/module.d/uswsusp
+===================================================================
+--- pm-utils-1.1.2.4.orig/pm/module.d/uswsusp	2008-10-22 13:33:10.000000000 +0800
++++ pm-utils-1.1.2.4/pm/module.d/uswsusp	2008-10-22 13:39:52.000000000 +0800
+@@ -1,10 +1,14 @@
+ #!/bin/sh
+ 
++. ${PM_UTILS_LIBDIR}/module.d/kernel
++
+ # disable processing of 99video
+ before_hooks()
+ {
+-	disablehook 00clear "disabled by uswsusp"
+-	disablehook 99video "disabled by uswsusp"
++	if [ "$ACTION" = hibernate ] || command_exists s2ram ; then
++		disablehook 00clear "disabled by uswsusp"
++		disablehook 99video "disabled by uswsusp"
++	fi
+ }
+ 
+ get_quirks()
+@@ -33,17 +37,19 @@
+ 	[ "$QUIRK_NONE" = "true" ] && OPTS=""
+ }
+ 
+-check_suspend()
+-{
+-	command_exists s2ram || return 1
+-	[ -c /dev/pmu ] || grep -q mem /sys/power/state
+-}
+-
+-do_suspend()
+-{
+-	get_quirks
+-	s2ram --force $OPTS
+-}
++if command_exists s2ram ; then
++	check_suspend()
++	{
++		command_exists s2ram || return 1
++		[ -c /dev/pmu ] || grep -q mem /sys/power/state
++	}
++
++	do_suspend()
++	{
++		get_quirks
++		s2ram --force $OPTS
++	}
++fi
+ 
+ check_hibernate()
+ {
