[Reproducible-commits] [debhelper] 01/14: dh_bugfiles: Correct regression in installing bug-script

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch pu/reproducible_builds
in repository debhelper.

commit 9559339b2b9d551bd836d67a76f50598148d2d16
Author: Niels Thykier <niels at thykier.net>
Date:   Thu May 7 19:59:12 2015 +0200

    dh_bugfiles: Correct regression in installing bug-script
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  8 ++++++++
 dh_bugfiles      | 13 +++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5eb26e..e139c58 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 at 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 0b5edf0..81e3675 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");
+			}
 		}
 	}
 	

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debhelper.git