diff -Nru procps-3.3.12/debian/changelog procps-3.3.12/debian/changelog
--- procps-3.3.12/debian/changelog	2016-07-11 20:31:17.000000000 +0000
+++ procps-3.3.12/debian/changelog	2016-07-12 06:08:48.000000000 +0000
@@ -1,3 +1,12 @@
+procps (2:3.3.12-1ubuntu2) yakkety; urgency=medium
+
+  * Remove strtod_nol tests Closes: #830733
+    (Cherry-picked from Debian packaging git).
+  * Only have one installinit override, thanks Sven! Closes: #827423
+    (Cherry-picked from Debian packaging git).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 12 Jul 2016 08:07:11 +0200
+
 procps (2:3.3.12-1ubuntu1) yakkety; urgency=medium
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru procps-3.3.12/debian/patches/remove_strtod_tests procps-3.3.12/debian/patches/remove_strtod_tests
--- procps-3.3.12/debian/patches/remove_strtod_tests	1970-01-01 00:00:00.000000000 +0000
+++ procps-3.3.12/debian/patches/remove_strtod_tests	2016-07-12 06:07:52.000000000 +0000
@@ -0,0 +1,10 @@
+--- a/lib/test_strtod_nol.c
++++ b/lib/test_strtod_nol.c
+@@ -32,6 +32,7 @@
+     int i;
+     double val;
+ 
++    return EXIT_SUCCESS; // always success
+     for(i=0; tests[i].string != NULL; i++) {
+         if(strtod_nol_or_err(tests[i].string, "Cannot parse number") !=
+            tests[i].result) {
diff -Nru procps-3.3.12/debian/patches/series procps-3.3.12/debian/patches/series
--- procps-3.3.12/debian/patches/series	2016-07-11 20:30:13.000000000 +0000
+++ procps-3.3.12/debian/patches/series	2016-07-12 06:08:24.000000000 +0000
@@ -1,3 +1,4 @@
+remove_strtod_tests
 disable_sched_test
 uptime_test
 pmap_test
diff -Nru procps-3.3.12/debian/rules procps-3.3.12/debian/rules
--- procps-3.3.12/debian/rules	2016-07-11 20:29:57.000000000 +0000
+++ procps-3.3.12/debian/rules	2016-07-12 06:07:08.000000000 +0000
@@ -75,8 +75,6 @@
 	(cd $(DEBROOT)/bin && mv w w.procps )
 	(cd $(DEBROOT)/usr/share/man/man1 && mv w.1 w.procps.1 )
 
-override_dh_installinit:
-	dh_installinit --no-start
 
 ifneq ($(DEB_HOST_ARCH_OS), linux)
 	rm -f \
@@ -120,7 +118,7 @@
 
 override_dh_installinit:
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-	dh_installinit 
+	dh_installinit --no-start
 endif
 
 override_dh_makeshlibs: