From: Joey Hess <joey@kitenet.net>
Date: Thu, 8 Dec 2011 22:40:02 +0000 (-0400)
Subject: dh_strip: Use build-id in /usr/lib/debug. Closes: #642158 Thanks, Jakub Wilk
X-Git-Tag: 8.9.13~5
X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain;h=72b8aa1a2f706537a7941dd9d6c025612c5cc044

dh_strip: Use build-id in /usr/lib/debug. Closes: #642158 Thanks, Jakub Wilk

I see no reason to make this v9 only.
---

diff --git a/debian/changelog b/debian/changelog
index a3a72c7..13320c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debhelper (8.9.13) UNRELEASED; urgency=low
 
   * Pass CPPFLAGS to qmake. Closes: #646129 Thanks, Felix Geyert
+  * dh_strip: Use build-id in /usr/lib/debug.
+    Closes: #642158 Thanks, Jakub Wilk
 
  -- Joey Hess <joeyh@debian.org>  Thu, 08 Dec 2011 18:27:02 -0400
 
diff --git a/dh_strip b/dh_strip
index 4dc6961..be0b000 100755
--- a/dh_strip
+++ b/dh_strip
@@ -161,7 +161,14 @@ sub make_debug {
 	return unless get_file_type($file) =~ /not stripped/;
 
 	my ($base_file)=$file=~/^\Q$tmp\E(.*)/;
-	my $debug_path=$desttmp."/usr/lib/debug/".$base_file;
+	my $debug_path;
+	my $elfnotes=`readelf -n $file`;
+	if ($elfnotes =~ /^\s+Build ID: ([0-9a-f]{2})([0-9a-f]+)$/m) {
+		$debug_path=$desttmp."/usr/lib/debug/.build-id/$1/$2.debug"
+	}
+	else {
+		$debug_path=$desttmp."/usr/lib/debug/".$base_file;
+	}
 	my $debug_dir=dirname($debug_path);
 	if (! -d $debug_dir) {
 		doit("install", "-d", $debug_dir);