[Debian-eeepc-devel] Bug#804963: eeepc-acpi-scripts: diff for NMU version 1.1.12+nmu1

[zeha at debian.org]

Michael,

Right, that should have been --no-start. Thanks for reviewing.

New nmudiff below, sent to DELAYED/5.

Chris


diff -Nru eeepc-acpi-scripts-1.1.12/debian/changelog eeepc-acpi-scripts-1.1.12+nmu1/debian/changelog
--- eeepc-acpi-scripts-1.1.12/debian/changelog	2011-10-03 04:52:50.000000000 +0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/changelog	2016-07-03 21:47:28.000000000 +0200
@@ -1,3 +1,18 @@
+eeepc-acpi-scripts (1.1.12+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Drop obsolete initscripts dependency. (Closes: #804963)
+
+  [ Christian Hofstaedtler ]
+  * Provide native unit for systemd wrapping the rcS script.
+    (Closes: #796605)
+  * Remove long obsolete DM-Upload-Allowed from debian/control.
+  * Switch from dh_clean -k to dh_prep.
+
+ -- Christian Hofstaedtler <zeha at debian.org>  Fri, 01 Jul 2016 16:38:29 +0200
+
 eeepc-acpi-scripts (1.1.12) unstable; urgency=low
 
   [ Ben Armstrong ]
diff -Nru eeepc-acpi-scripts-1.1.12/debian/control eeepc-acpi-scripts-1.1.12+nmu1/debian/control
--- eeepc-acpi-scripts-1.1.12/debian/control	2011-09-25 08:21:55.000000000 +0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/control	2016-07-03 21:47:28.000000000 +0200
@@ -6,16 +6,15 @@
  Nico Golde <nion at debian.org>,
  Darren Salt <linux at youmustbejoking.demon.co.uk>,
  Raphael Geissert <geissert at debian.org>
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), dh-systemd
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git
 Vcs-Browser: http://git.debian.org/?p=debian-eeepc/eeepc-acpi-scripts.git
-DM-Upload-Allowed: yes
 
 Package: eeepc-acpi-scripts
 Architecture: all
 Depends: acpid (>= 1:2.0.0-1), acpi-support-base, acpi-support,
- initscripts (>= 2.88dsf-13.3), pm-utils, rfkill (>= 0.3-3),
+ pm-utils, rfkill (>= 0.3-3),
  ${misc:Depends}
 Suggests: alsa-utils, libnotify-bin
 Description: Scripts to support suspend and hotkeys on the Asus Eee PC laptop
diff -Nru eeepc-acpi-scripts-1.1.12/debian/eeepc-acpi-scripts.service eeepc-acpi-scripts-1.1.12+nmu1/debian/eeepc-acpi-scripts.service
--- eeepc-acpi-scripts-1.1.12/debian/eeepc-acpi-scripts.service	1970-01-01 01:00:00.000000000 +0100
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/eeepc-acpi-scripts.service	2016-07-03 21:47:28.000000000 +0200
@@ -0,0 +1,14 @@
+[Unit]
+Description=Load EeePC-specific settings
+DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExistsGlob=/sys/devices/platform/eeepc*
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/eeepc-acpi-scripts start
+ExecStop=/etc/init.d/eeepc-acpi-scripts stop
+
+[Install]
+WantedBy=sysinit.target
diff -Nru eeepc-acpi-scripts-1.1.12/debian/rules eeepc-acpi-scripts-1.1.12+nmu1/debian/rules
--- eeepc-acpi-scripts-1.1.12/debian/rules	2011-09-25 08:19:39.000000000 +0200
+++ eeepc-acpi-scripts-1.1.12+nmu1/debian/rules	2016-07-03 21:47:28.000000000 +0200
@@ -24,7 +24,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	install -m 0755 eeepc-acpi-scripts/* $(TMP)/usr/share/acpi-support/eeepc-acpi-scripts
 	install -m 0644 acpilib/* $(TMP)/usr/share/acpi-support/eeepc-acpi-scripts/lib
@@ -43,7 +43,9 @@
 	mkdir -p debian/eeepc-acpi-scripts/usr/share/doc/eeepc-acpi-scripts/examples
 	cat debian/eeepc-acpi-scripts.default.doc-head debian/eeepc-acpi-scripts.default.in >debian/eeepc-acpi-scripts/usr/share/doc/eeepc-acpi-scripts/examples/eeepc-acpi-scripts.default
 	(cat debian/eeepc-acpi-scripts.default.etc-head; sed -e '/^# / d; /^$$/ d; /^#$$/ d' debian/eeepc-acpi-scripts.default.in) >debian/eeepc-acpi-scripts/etc/default/eeepc-acpi-scripts
+	dh_systemd_enable
 	dh_installinit --no-start -u'start 20 S .'
+	dh_systemd_start
 	dh_compress
 	dh_link
 	dh_fixperms