diff -u laptop-mode-tools-1.34/debian/rules laptop-mode-tools-1.34/debian/rules
--- laptop-mode-tools-1.34/debian/rules
+++ laptop-mode-tools-1.34/debian/rules
@@ -28,7 +28,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	-rm debian/laptop-mode-tools.laptop-mode.init
+	-rm -f debian/laptop-mode-tools.laptop-mode.init
 	-rm -f build-stamp configure-stamp
 	dh_clean 
 
@@ -44,8 +44,8 @@
 
 	# Add here commands to install the package into debian/laptop-mode-tools.
 	mkdir -p $(DESTDIR)/etc/laptop-mode
-	mkdir -p $(DESTDIR)/etc/acpi/events
-	mkdir -p $(DESTDIR)/etc/acpi/actions
+#	mkdir -p $(DESTDIR)/etc/acpi/events
+#	mkdir -p $(DESTDIR)/etc/acpi/actions
 	mkdir -p $(DESTDIR)/usr/sbin
 	mkdir -p $(DESTDIR)/usr/lib/laptop-mode-tools/modules
 	mkdir -p $(DESTDIR)/etc/apm/event.d
@@ -61,8 +61,8 @@
 	mkdir -p $(DESTDIR)/etc/laptop-mode/modules
 	install -m600 etc/laptop-mode/laptop-mode.conf $(DESTDIR)/etc/laptop-mode/laptop-mode.conf
 	install -m600 etc/laptop-mode/conf.d/* $(DESTDIR)/etc/laptop-mode/conf.d
-	install -m700 etc/acpi/actions/* $(DESTDIR)/etc/acpi/actions
-	install -m600 etc/acpi/events/* $(DESTDIR)/etc/acpi/events
+#	install -m700 etc/acpi/actions/* $(DESTDIR)/etc/acpi/actions
+#	install -m600 etc/acpi/events/* $(DESTDIR)/etc/acpi/events
 	install -m700 etc/apm/event.d/* $(DESTDIR)/etc/apm/event.d
 	install -m700 etc/power/scripts.d/* $(DESTDIR)/etc/power/scripts.d
 	install -m700 etc/power/event.d/* $(DESTDIR)/etc/power/event.d
diff -u laptop-mode-tools-1.34/debian/changelog laptop-mode-tools-1.34/debian/changelog
--- laptop-mode-tools-1.34/debian/changelog
+++ laptop-mode-tools-1.34/debian/changelog
@@ -1,3 +1,14 @@
+laptop-mode-tools (1.34-1ubuntu2) gutsy; urgency=low
+
+  * debian/rules: Don't ship acpi scripts (we handle that ourselves)
+    (This change got lost in the last merge)
+  * debian/laptop-mode-tools.preinst: remove any old acpi scripts
+  * debian/laptop-mode-tools.postinst: Include update-rc.d (LP: #127273)
+    (Debian generates the .postinst from dh_makeinit)
+  * debian/rules: use rm -f to avoid missing-file message
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Sat, 21 Jul 2007 00:13:42 +0200
+
 laptop-mode-tools (1.34-1ubuntu1) gutsy; urgency=low
 
   * Merge from debian unstable, remaining changes:
diff -u laptop-mode-tools-1.34/debian/laptop-mode-tools.postinst laptop-mode-tools-1.34/debian/laptop-mode-tools.postinst
--- laptop-mode-tools-1.34/debian/laptop-mode-tools.postinst
+++ laptop-mode-tools-1.34/debian/laptop-mode-tools.postinst
@@ -10,0 +11,10 @@
+
+# This would automatically be added by dh_installinit in Debian
+if [ -x "/etc/init.d/laptop-mode" ]; then
+	update-rc.d laptop-mode defaults 99 >/dev/null
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d laptop-mode start || exit $?
+	else
+		/etc/init.d/laptop-mode start || exit $?
+	fi
+fi
only in patch2:
unchanged:
--- laptop-mode-tools-1.34.orig/debian/laptop-mode-tools.preinst
+++ laptop-mode-tools-1.34/debian/laptop-mode-tools.preinst
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
+	# Remove any previously installed acpi files
+	rm -f /etc/acpi/events/lm_ac_adapter
+	rm -f /etc/acpi/events/lm_battery
+	rm -f /etc/acpi/events/lm_lid
+
+	rm -f /etc/acpi/actions/lm_ac_adapter.sh
+	rm -f /etc/acpi/actions/lm_battery.sh
+	rm -f /etc/acpi/actions/lm_lid.sh
+fi