diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2013-05-23 15:53:28 +0100 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-06-04 11:24:21 -0400 |
commit | 6433b0009c577fd0a32cdd108cd23c4b62f86571 (patch) | |
tree | 995d8e39ed13e411b44feedf2fa96e2a144f02de /dh_installinit | |
parent | d188caa717f3d472cfd81701c543e7dddf79c68b (diff) | |
download | debhelper-6433b0009c577fd0a32cdd108cd23c4b62f86571.tar.gz |
Bug#709482: dh_installinit: permit file-rc for upstart jobs
Package: debhelper
Version: 9.20130518
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch saucy
Control: block -1 by 709481
Hi,
Thorsten Glaser pointed out to me this morning that forwarding Ubuntu's
backlog of Upstart jobs to Debian will cause a bunch of packages to be
incompatible with file-rc. Now, I don't know how long file-rc is
sticking around, but it doesn't seem right for Upstart jobs to be the
thing that force it out, so I think we should fix this.
I sent a patch to the file-rc maintainers as #709481 which brings their
invoke-rc.d up to date with the upstart support in sysv-rc. Once that's
applied, I think the following patch should be applied to debhelper,
although you'll need to adjust it to match whatever version they choose.
Diffstat (limited to 'dh_installinit')
-rwxr-xr-x | dh_installinit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dh_installinit b/dh_installinit index 3260866f..ef000c46 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)"); + addsubstvar($package, "misc:Depends", "sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.15+nmu1)"); } if ($init ne '' && ! $dh{ONLYSCRIPTS}) { |