diff options
| author | Niels Thykier <niels@thykier.net> | 2015-05-07 19:59:12 +0200 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2015-05-07 19:59:12 +0200 |
| commit | 9559339b2b9d551bd836d67a76f50598148d2d16 (patch) | |
| tree | eda8b3f085958b645bb83a2f249a78388f9243d0 | |
| parent | fdf61f73fcdca21c5bf18a64b05288af6086a170 (diff) | |
| download | debhelper-9559339b2b9d551bd836d67a76f50598148d2d16.tar.gz | |
dh_bugfiles: Correct regression in installing bug-script
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | dh_bugfiles | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index f5eb26ec..e139c583 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debhelper (9.20150507) UNRELEASED; urgency=medium + + * dh_bugfiles: Fix regression in installing the reportbug + script correctly. Thanks to Jakub Wilk for reporting. + (Closes: #784648) + + -- Niels Thykier <niels@thykier.net> Thu, 07 May 2015 19:57:50 +0200 + debhelper (9.20150502) unstable; urgency=medium * dh_compress: REVERT change to avoid compressing ".xhtml" diff --git a/dh_bugfiles b/dh_bugfiles index 0b5edf0e..81e36754 100755 --- a/dh_bugfiles +++ b/dh_bugfiles @@ -77,7 +77,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { next if is_udeb($package); my $tmp=tmpdir($package); - my $dir="$tmp/usr/share/bug/$package"; + my $p_dir="${tmp}/usr/share/bug"; + my $dir="${p_dir}/$package"; # Gather information which bug files are available for the # package in question @@ -95,8 +96,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # If there is only a bug script to install, install it as # usr/share/bug/$package (unless this path is a directory) if (! -d $dir && scalar(keys(%bugfiles)) == 1 && exists $bugfiles{script}) { - install_dir($dir); - install_file($bugfiles{script}, $dir); + install_dir($p_dir); + install_prog($bugfiles{script}, $dir); } elsif (scalar(keys(%bugfiles)) > 0) { if (-f $dir) { @@ -109,7 +110,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { install_dir($dir); } while (my ($type, $srcfile) = each(%bugfiles)) { - install_file($srcfile, "$dir/$type"); + if ($type eq 'script') { + install_prog($srcfile, "$dir/$type"); + } else { + install_file($srcfile, "$dir/$type"); + } } } |