[debhelper-devel] Ubuntu debhelper 9.20140228ubuntu5

Ubuntu Merge-o-Matic mom at ubuntu.com
Wed May 28 13:38:45 UTC 2014


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: Wed, 28 May 2014 11:00:44 +0200
Source: debhelper
Binary: debhelper
Architecture: source
Version: 9.20140228ubuntu5
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
Launchpad-Bugs-Fixed: 1312836
Changes: 
 debhelper (9.20140228ubuntu5) utopic; urgency=medium
 .
   * Enable calling update-rc.d, if an init.d script is installed,
     regardless presence of the upstart jobs. (LP: #1312836)
 .
 debhelper (9.20140228ubuntu4) utopic; urgency=medium
 .
   * Re-introduce the dh_installinit change but this time depending on
     lsb-base where the hook was moved. This should prevent upgrade breakage.
 .
 debhelper (9.20140228ubuntu3) utopic; urgency=medium
 .
   * Revert the last change as it's causing apt upgrade resolution
     failure breaking all buildds.
Checksums-Sha1: 
 c8da20dd5dfdc117f32b2dea89ebd9b5df6dc688 1757 debhelper_9.20140228ubuntu5.dsc
 9b76eb08cf43da31e46843bf88dc9e29ced171b4 477304 debhelper_9.20140228ubuntu5.tar.gz
Checksums-Sha256: 
 75e06dc3b41e235a54cbef7df6d0086f38743a833da4448865a7406201ac34b8 1757 debhelper_9.20140228ubuntu5.dsc
 ba3a6b467e5946942f74105ab6df52e7260f97d1e670ce6225a0f933b838ffd1 477304 debhelper_9.20140228ubuntu5.tar.gz
Files: 
 f850385b438b05ba8f8487c2f7da94c3 1757 devel optional debhelper_9.20140228ubuntu5.dsc
 494190459e7850682f49ed047a4c2c18 477304 devel optional debhelper_9.20140228ubuntu5.tar.gz
Original-Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 9.20140228ubuntu2/autoscripts/postinst-init 9.20140228ubuntu5/autoscripts/postinst-init
--- 9.20140228ubuntu2/autoscripts/postinst-init	2014-05-09 11:01:42.000000000 +0000
+++ 9.20140228ubuntu5/autoscripts/postinst-init	2014-05-28 06:32:10.000000000 +0000
@@ -1,6 +1,4 @@
 if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
-	if [ ! -e "/etc/init/#SCRIPT#.conf" ]; then
-		update-rc.d #SCRIPT# #INITPARMS# >/dev/null
-	fi
+	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
 	invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#
 fi
diff -pruN 9.20140228ubuntu2/autoscripts/postinst-init-nostart 9.20140228ubuntu5/autoscripts/postinst-init-nostart
--- 9.20140228ubuntu2/autoscripts/postinst-init-nostart	2014-05-09 11:01:42.000000000 +0000
+++ 9.20140228ubuntu5/autoscripts/postinst-init-nostart	2014-05-28 06:32:22.000000000 +0000
@@ -1,5 +1,3 @@
 if [ -x "/etc/init.d/#SCRIPT#" ]; then
-	if [ ! -e "/etc/init/#SCRIPT#.conf" ]; then
-		update-rc.d #SCRIPT# #INITPARMS# >/dev/null
-	fi
+	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
 fi
diff -pruN 9.20140228ubuntu2/autoscripts/postinst-init-restart 9.20140228ubuntu5/autoscripts/postinst-init-restart
--- 9.20140228ubuntu2/autoscripts/postinst-init-restart	2014-05-09 11:01:42.000000000 +0000
+++ 9.20140228ubuntu5/autoscripts/postinst-init-restart	2014-05-28 06:32:36.000000000 +0000
@@ -1,7 +1,5 @@
 if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
-	if [ ! -e "/etc/init/#SCRIPT#.conf" ]; then
-		update-rc.d #SCRIPT# #INITPARMS# >/dev/null
-	fi
+	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
 	if [ -n "$2" ]; then
 		_dh_action=restart
 	else
diff -pruN 9.20140228ubuntu2/autoscripts/postinst-upstart-replace 9.20140228ubuntu5/autoscripts/postinst-upstart-replace
--- 9.20140228ubuntu2/autoscripts/postinst-upstart-replace	2014-05-09 11:01:42.000000000 +0000
+++ 9.20140228ubuntu5/autoscripts/postinst-upstart-replace	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-update-rc.d -f #SCRIPT# remove >/dev/null || #ERROR_HANDLER#
diff -pruN 9.20140228ubuntu2/debian/changelog 9.20140228ubuntu5/debian/changelog
--- 9.20140228ubuntu2/debian/changelog	2014-05-26 12:39:04.000000000 +0000
+++ 9.20140228ubuntu5/debian/changelog	2014-05-28 09:00:44.000000000 +0000
@@ -1,3 +1,24 @@
+debhelper (9.20140228ubuntu5) utopic; urgency=medium
+
+  * Enable calling update-rc.d, if an init.d script is installed,
+    regardless presence of the upstart jobs. (LP: #1312836)
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Wed, 28 May 2014 11:00:44 +0200
+
+debhelper (9.20140228ubuntu4) utopic; urgency=medium
+
+  * Re-introduce the dh_installinit change but this time depending on
+    lsb-base where the hook was moved. This should prevent upgrade breakage.
+
+ -- Stéphane Graber <stgraber at ubuntu.com>  Tue, 27 May 2014 16:21:35 +0200
+
+debhelper (9.20140228ubuntu3) utopic; urgency=medium
+
+  * Revert the last change as it's causing apt upgrade resolution
+    failure breaking all buildds.
+
+ -- Stéphane Graber <stgraber at ubuntu.com>  Tue, 27 May 2014 15:37:20 +0200
+
 debhelper (9.20140228ubuntu2) utopic; urgency=medium
 
   * Add upstart versioned dependency on upstart that provides lsb hook, to
diff -pruN 9.20140228ubuntu2/dh_installinit 9.20140228ubuntu5/dh_installinit
--- 9.20140228ubuntu2/dh_installinit	2014-05-26 12:21:40.000000000 +0000
+++ 9.20140228ubuntu5/dh_installinit	2014-05-28 07:27:19.000000000 +0000
@@ -226,8 +226,8 @@ foreach my $package (@{$dh{DOPACKAGES}})
 		}
 		
 		doit("install","-p","-m644",$job,"$tmp/etc/init/$jobfile.conf");
-		# Add dependency on upstart that provides lsb-hook
-		addsubstvar($package, "misc:Depends", "upstart", ">= 1.12.1-0ubuntu6");
+		# Add dependency on lsb-base that provides the upstart lsb-hook
+		addsubstvar($package, "misc:Depends", "lsb-base", ">= 4.1+Debian11ubuntu7");
 	}
 
 	my $default=pkgfile($package,'default');
@@ -325,8 +325,6 @@ foreach my $package (@{$dh{DOPACKAGES}})
 				$script=$jobfile;
 				autoscript($package,"preinst", "preinst-upstart-compatibility",
 					"s!#OLD#!/etc/init.d/$script!g;s!#PACKAGE#!$package!g");
-				autoscript($package,"postinst", "postinst-upstart-replace",
-					"s/#SCRIPT#/$script/g;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
 			} else {
 				# removes rc.d links
 				autoscript($package,"postrm","postrm-init",


More information about the debhelper-devel mailing list