[debhelper-devel] Ubuntu debhelper 9.20140228ubuntu6

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Thu, 29 May 2014 11:50:53 +0100
Source: debhelper
Binary: debhelper
Architecture: source
Version: 9.20140228ubuntu6
Distribution: utopic
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Dimitri John Ledkov <xnox at ubuntu.com>
Description: 
 debhelper  - helper programs for debian/rules
Changes: 
 debhelper (9.20140228ubuntu6) utopic; urgency=medium
 .
   * Fix the previous upload, by not calling update-rc.d on packages that
     just have upstart job without init.d.
Checksums-Sha1: 
 e90b322fadaa1a0060bc904c1cd54c57fce241b1 1759 debhelper_9.20140228ubuntu6.dsc
 a73009996f563422c08286dc0b215ac488d9c5f4 483282 debhelper_9.20140228ubuntu6.tar.gz
Checksums-Sha256: 
 5667a2ac34b032263f42fb0bc840131fea55c4fcf258a15712b63159a23a2c6c 1759 debhelper_9.20140228ubuntu6.dsc
 8a40d1fce98d6d1cc250f31e37513068592c7b0f08878de112425fe0ac1c6532 483282 debhelper_9.20140228ubuntu6.tar.gz
Files: 
 6ed28af1b89e16c479902329c3fb4553 1759 devel optional debhelper_9.20140228ubuntu6.dsc
 dac7c6fd7a096eaffb645a350296fd32 483282 devel optional debhelper_9.20140228ubuntu6.tar.gz
Original-Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 9.20140228ubuntu5/autoscripts/postinst-init 9.20140228ubuntu6/autoscripts/postinst-init
--- 9.20140228ubuntu5/autoscripts/postinst-init	2014-05-28 06:32:10.000000000 +0000
+++ 9.20140228ubuntu6/autoscripts/postinst-init	2014-05-29 10:30:00.000000000 +0000
@@ -1,4 +1,6 @@
-if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
+if [ -x "/etc/init.d/#SCRIPT#" ]; then
 	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+fi
+if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
 	invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#
 fi
diff -pruN 9.20140228ubuntu5/autoscripts/postinst-init-restart 9.20140228ubuntu6/autoscripts/postinst-init-restart
--- 9.20140228ubuntu5/autoscripts/postinst-init-restart	2014-05-28 06:32:36.000000000 +0000
+++ 9.20140228ubuntu6/autoscripts/postinst-init-restart	2014-05-29 10:27:46.000000000 +0000
@@ -1,5 +1,7 @@
+if [ -x "/etc/init.d/#SCRIPT#" ]; then
+	update-rc.d #SCRIPT# #INITPARMS# >/dev/null   
+fi
 if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
-	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
 	if [ -n "$2" ]; then
 		_dh_action=restart
 	else
diff -pruN 9.20140228ubuntu5/debian/changelog 9.20140228ubuntu6/debian/changelog
--- 9.20140228ubuntu5/debian/changelog	2014-05-28 09:00:44.000000000 +0000
+++ 9.20140228ubuntu6/debian/changelog	2014-05-29 10:50:53.000000000 +0000
@@ -1,3 +1,10 @@
+debhelper (9.20140228ubuntu6) utopic; urgency=medium
+
+  * Fix the previous upload, by not calling update-rc.d on packages that
+    just have upstart job without init.d.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Thu, 29 May 2014 11:50:53 +0100
+
 debhelper (9.20140228ubuntu5) utopic; urgency=medium
 
   * Enable calling update-rc.d, if an init.d script is installed,