[debhelper-devel] [debhelper] 06/07: dh_gencontrol: Do not duplicate build-ids in the original package

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 6f334f49e3dab138e0189f2bd6db822b3a7d5e5a
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Aug 22 19:33:55 2015 +0200

    dh_gencontrol: Do not duplicate build-ids in the original package
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_gencontrol | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dh_gencontrol b/dh_gencontrol
index 8166a57..2a00951 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -121,9 +121,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 		doit("chmod","0644","${ddeb_tmp}/DEBIAN/control");
 		doit("chown","0:0","${ddeb_tmp}/DEBIAN/control");
-	}
-
-	if ($build_ids) {
+	} elsif ($build_ids) {
+		# Only include the build-id if there is no ddeb (if there is a
+		# ddeb, the build-ids into the ddeb's control file)
 		push(@debug_info_params, "-DX-Build-Ids=${build_ids}");
 	}
 

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