[debhelper-devel] [debhelper] 20/28: dh_strip: Do not create -dbg-dbgsym packages

[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 31f8040e150b22a9f867bf5b77023e3d1b0d8e0e
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jun 13 12:50:52 2015 +0200

    dh_strip: Do not create -dbg-dbgsym packages
    
    Thanks to the reproducibility team for catching this.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 1 +
 dh_strip         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 253714d..4672484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ debhelper (9.20150520+ddebs) UNRELEASED; urgency=medium
   * dh_gencontrol: Put ddebs in the "debugsym" section.
   * dh_strip: Support a new --[no-]ddebs option intended for
     packages to disable automatic ddebs.
+  * dh_strip: Do not create ddebs for "-dbg" packages.
 
  -- Niels Thykier <niels at thykier.net>  Mon, 25 May 2015 12:10:37 +0200
 
diff --git a/dh_strip b/dh_strip
index feed037..7a01bb7 100755
--- a/dh_strip
+++ b/dh_strip
@@ -289,7 +289,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	if ($enable_ddebs and not $keep_debug and package_arch($package) ne 'all') {
 		# Avoid creating a ddeb that would clash with a registered package
-		if (!$all_packages{"${package}-dbgsym"}) {
+		# or looks like a manual -dbg package.
+		if (!$all_packages{"${package}-dbgsym"} or $package =~ m/-dbg$/) {
 			$debugtmp = "debian/.debhelper/${package}/ddeb-root";
 			$keep_debug = 1;
 			$use_build_id = 2;

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