[debhelper-devel] [debhelper] 02/02: dh_dhlibdeps: Use a strict whitelist debug dirs to skip

[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 0497ab2e0eae0dd146d11ce975d33cdedebe00f9
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jun 26 10:14:56 2017 +0000

    dh_dhlibdeps: Use a strict whitelist debug dirs to skip
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_shlibdeps     | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ed9c44c..75726f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ debhelper (10.5.1) UNRELEASED; urgency=medium
   * dh_installdocs: Avoid unnecssary stat call.
   * dh_installman: Ditto.
   * dh_strip: Ditto.
+  * dh_shlibdeps: Fix a regression where non-detached debug symbol files
+    where not properly processed.  Thanks to Sven Joachim for reporting
+    the issue.  (Closes: #865982)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 25 Jun 2017 18:02:30 +0000
 
diff --git a/dh_shlibdeps b/dh_shlibdeps
index ca37fe0..cfef36f 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -118,7 +118,9 @@ on_pkgs_in_parallel {
 		}
 		foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" -or -name "*.node" \\) $find_options -print`)) {
 			# Prune directories that contain separated debug symbols.
-			next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul)/!;
+			# CAVEAT: There are files in /usr/lib/debug that are not detached debug symbols,
+			# which should be processed.  (see #865982)
+			next if $file=~m!^\Q$tmp\E/usr/lib/debug/(lib|lib64|usr|bin|sbin|opt|dev|emul|\.build-id)/!;
 			# TODO this is slow, optimize. Ie, file can run once on
 			# multiple files..
 			$ff=`file "$file"`;

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