diff -pruN 0.5.2-9/debian/49-915-resolution-set.sh 0.5.2-9ubuntu1/debian/49-915-resolution-set.sh
--- 0.5.2-9/debian/49-915-resolution-set.sh	1970-01-01 01:00:00.000000000 +0100
+++ 0.5.2-9ubuntu1/debian/49-915-resolution-set.sh	2006-12-11 12:33:18.000000000 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -x /usr/sbin/915resolution ]; then
+    . /etc/default/915resolution
+    if [ "$MODE" = auto ] || [ -n "$MODE" -a -n "$XRESO" -a -n "$YRESO" ] ; then
+	/etc/init.d/915resolution start;
+    fi
+fi
diff -pruN 0.5.2-9/debian/changelog 0.5.2-9ubuntu1/debian/changelog
--- 0.5.2-9/debian/changelog	2006-12-11 13:32:47.000000000 +0000
+++ 0.5.2-9ubuntu1/debian/changelog	2006-12-11 12:33:18.000000000 +0000
@@ -1,3 +1,10 @@
+915resolution (0.5.2-9ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Rerun 915resolution upon ACPI resume.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Fri,  8 Dec 2006 20:29:45 +1100
+
 915resolution (0.5.2-9) unstable; urgency=medium
 
   * Fix bad typo in init script (Closes: #401820)
@@ -17,6 +24,13 @@
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Tue,  5 Dec 2006 19:52:11 +0100
 
+915resolution (0.5.2-7ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Rerun 915resolution upon ACPI resume.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 29 Nov 2006 14:23:23 +1100
+
 915resolution (0.5.2-7) unstable; urgency=medium
 
   * Include patch for 946GZ, 965G and 965Q chipsets (Closes: #399221)
@@ -26,6 +40,13 @@
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Wed, 22 Nov 2006 18:29:53 +0100
 
+915resolution (0.5.2-6ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Rerun 915resolution upon ACPI resume.
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Tue, 14 Nov 2006 01:29:17 +0000
+
 915resolution (0.5.2-6) unstable; urgency=low
 
   * Make sure that the init script exits gracefully in case the chipset
@@ -34,6 +55,13 @@
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Tue, 14 Nov 2006 00:10:56 +1100
 
+915resolution (0.5.2-5ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Rerun 915resolution upon ACPI resume.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Fri, 10 Nov 2006 17:10:21 +1100
+
 915resolution (0.5.2-5) unstable; urgency=low
 
   * Introduce auto detection, fetched from Ubuntu
@@ -47,6 +75,16 @@
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Sat, 14 Oct 2006 21:08:02 +1000
 
+915resolution (0.5.2-4ubuntu1) edgy; urgency=low
+
+  * Bring back some Ubuntu changes which were lost a while ago in
+    a sync:
+    - Use vbetool to get native panel resolution from the hardware,
+      removing need for manual configuration.
+    - Rerun 915resolution upon ACPI resume.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Tue, 19 Sep 2006 08:48:30 +1000
+
 915resolution (0.5.2-4) unstable; urgency=low
 
   * Fix spelling errors in description (Closes: #363570)
@@ -107,3 +145,4 @@
   * Initial release (Closes: #338530)
 
  -- Steffen Joeris <steffen.joeris@skolelinux.de>  Thu, 10 Nov 2005 11:33:30 +0100
+
diff -pruN 0.5.2-9/debian/dirs 0.5.2-9ubuntu1/debian/dirs
--- 0.5.2-9/debian/dirs	1970-01-01 01:00:00.000000000 +0100
+++ 0.5.2-9ubuntu1/debian/dirs	2006-12-11 12:33:18.000000000 +0000
@@ -0,0 +1 @@
+/etc/acpi/resume.d
diff -pruN 0.5.2-9/debian/rules 0.5.2-9ubuntu1/debian/rules
--- 0.5.2-9/debian/rules	2006-12-11 13:32:47.000000000 +0000
+++ 0.5.2-9ubuntu1/debian/rules	2006-12-11 12:33:18.000000000 +0000
@@ -25,6 +25,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 	install -D -m 755 915resolution $(CURDIR)/debian/915resolution/usr/sbin/915resolution
+	install -D -m 755 debian/49-915-resolution-set.sh $(CURDIR)/debian/915resolution/etc/acpi/resume.d/49-915-resolution-set.sh
+	ln -s 49-915-resolution-set.sh $(CURDIR)/debian/915resolution/etc/acpi/resume.d/13-915-resolution-set.sh
 
 # Build architecture-independent files here.
 binary-indep: build install