[debhelper-devel] [debhelper] 02/02: dh_strip: Do not strip debug symbols in the .build-id dir

[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 847e5b8a4657323152eb5d224d0b82277a511270
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jan 2 08:54:02 2018 +0000

    dh_strip: Do not strip debug symbols in the .build-id dir
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_strip         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8fa231f..418bef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,9 @@ debhelper (11.1) UNRELEASED; urgency=medium
     needing a shell.
   * dh_clean: Skip cleaning in the '.pc' and '_darcs' directories.
     (Closes: #566861)
+  * dh_strip: Do not strip debug symbols in ".../debug/.build-id/".
+    Thanks to Mattia Rizzolo for reporting the bug.
+    (Closes: #886037)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 17 Dec 2017 07:59:18 +0000
 
diff --git a/dh_strip b/dh_strip
index 56ae052..4006251 100755
--- a/dh_strip
+++ b/dh_strip
@@ -182,6 +182,9 @@ sub testfile {
 		$File::Find::prune = 1 if -d _;
 		return;
 	}
+	# Ignore the .../debug/.build-id/ directory.  It is not really helpful
+	# to strip debug symbols.
+	$File::Find::prune = 1 if -d _ && index($fn, '/debug/.build-id/') > -1;
 	return if -d _;
 
 	# Is it a debug library in a debug subdir?

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