[debhelper-devel] Ubuntu debhelper 9.20140228ubuntu2

[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: Mon, 26 May 2014 14:39:04 +0200
Source: debhelper
Binary: debhelper
Architecture: source
Version: 9.20140228ubuntu2
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: 1323274
Changes: 
 debhelper (9.20140228ubuntu2) utopic; urgency=medium
 .
   * Add upstart versioned dependency on upstart that provides lsb hook, to
     make sure sourcing lsb init-functions triggers transparent launching
     of the upstart job instead. (LP: #1323274).
Checksums-Sha1: 
 c0b4894c19255843bf2cfa36b704c24b299720a0 1757 debhelper_9.20140228ubuntu2.dsc
 51addb27b61556e75f4f4cb55d195549330745da 482631 debhelper_9.20140228ubuntu2.tar.gz
Checksums-Sha256: 
 c822119ab6650de0c1672afbc19cd887e07a16e5c04cab071b41f32a089735ae 1757 debhelper_9.20140228ubuntu2.dsc
 fc20e301bcc8a3b880b756beb425f6ee8577b83cfab605157d5d879716482f38 482631 debhelper_9.20140228ubuntu2.tar.gz
Files: 
 c5c18af81b0e8737b7b4547b16ee1c01 1757 devel optional debhelper_9.20140228ubuntu2.dsc
 69b873aa0c712746892b45bc0db7d197 482631 devel optional debhelper_9.20140228ubuntu2.tar.gz
Original-Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 9.20140228ubuntu1/debian/changelog 9.20140228ubuntu2/debian/changelog
--- 9.20140228ubuntu1/debian/changelog	2014-05-09 12:20:25.000000000 +0000
+++ 9.20140228ubuntu2/debian/changelog	2014-05-26 12:39:04.000000000 +0000
@@ -1,3 +1,11 @@
+debhelper (9.20140228ubuntu2) utopic; urgency=medium
+
+  * Add upstart versioned dependency on upstart that provides lsb hook, to
+    make sure sourcing lsb init-functions triggers transparent launching
+    of the upstart job instead. (LP: #1323274).
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 26 May 2014 14:39:04 +0200
+
 debhelper (9.20140228ubuntu1) utopic; urgency=medium
 
   * Resynchronise with Debian.  Remaining changes:
diff -pruN 9.20140228ubuntu1/dh_installinit 9.20140228ubuntu2/dh_installinit
--- 9.20140228ubuntu1/dh_installinit	2014-05-09 11:11:39.000000000 +0000
+++ 9.20140228ubuntu2/dh_installinit	2014-05-26 12:21:40.000000000 +0000
@@ -226,6 +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");
 	}
 
 	my $default=pkgfile($package,'default');