summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-06-04 11:26:53 -0400
committerJoey Hess <joey@kitenet.net>2013-06-04 11:27:22 -0400
commit23157b0bedd0430ca09383fa41aebcc675378727 (patch)
treee9229ffae73ca7f615353e73e1e32f058447bbe3
parent6433b0009c577fd0a32cdd108cd23c4b62f86571 (diff)
update
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_installinit2
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index a4cd5add..3755a50d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (9.20130519) UNRELEASED; urgency=low
+debhelper (9.20130604) UNRELEASED; urgency=low
* dh_installchangelogs: No longer automatically converts html changelogs.
A plain text version can be provided as a second parameter, or it will
@@ -8,8 +8,11 @@ debhelper (9.20130519) UNRELEASED; urgency=low
Closes: #709557
* Correct broken patch for #706923.
Closes: #707481
+ * dh_installinit: Add appropriately versioned file-rc as an alternate
+ when adding misc:Depends for an invoke-rc.d that supports upstart
+ jobs. Closes: #709482
- -- Joey Hess <joeyh@debian.org> Fri, 24 May 2013 11:08:12 -0400
+ -- Joey Hess <joeyh@debian.org> Tue, 04 Jun 2013 11:22:54 -0400
debhelper (9.20130518) unstable; urgency=low
diff --git a/dh_installinit b/dh_installinit
index ef000c46..4b6702d8 100755
--- a/dh_installinit
+++ b/dh_installinit
@@ -228,7 +228,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
if ($job ne '' || ($dh{ONLYSCRIPTS} && -e "$tmp/etc/init/$jobfile.conf")) {
# minimal version of invoke-rc.d that supports upstart jobs
# directly
- addsubstvar($package, "misc:Depends", "sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.15+nmu1)");
+ addsubstvar($package, "misc:Depends", "sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16)");
}
if ($init ne '' && ! $dh{ONLYSCRIPTS}) {