only v9

Reason:
http://git.42mm.org/?p=python-greenlet;a=blob;f=debian/rules;h=bd009f86895d496999cd412eac44dbae7b9f1caa;hb=HEAD#l10

diff --git a/debhelper.pod b/debhelper.pod
index 65616e39b59b52b015c6cc9b0720452f9e302061..72234ca7ef2f5c7c754a51511a50affbd1fa28f2 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -509,6 +509,11 @@ they are already set. They support DEB_BUILD_OPTIONS=noopt too.
 B<dh_auto_configure> passes CFLAGS to perl F<Makefile.PL> and
 F<Build.PL>
 
+=item -
+
+B<dh_strip> puts separated debug symbols in a location based on their
+build-id.
+
 =back
 
 =back

diff --git a/debian/changelog b/debian/changelog
index 74f5bc40f97580ae6cbedb0a4e1e850fdd1598c8..43c9d4a6d1653e0b86474903960fdb5a0c2e4352 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 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.
+  * dh_strip: Use build-id in /usr/lib/debug in v9.
     Closes: #642158 Thanks, Jakub Wilk
   * Spanish translation update. Closes: #636245 Thanks, Omar Campagne
 

diff --git a/dh_strip b/dh_strip
index be0b000d7abd3947db1699c352fe13a4fc65b54c..57c45f5c7e5a9786091da07ea450381219c4975a 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -162,8 +162,8 @@ sub make_debug {
 
        my ($base_file)=$file=~/^\Q$tmp\E(.*)/;
        my $debug_path;
-       my $elfnotes=`readelf -n $file`;
-       if ($elfnotes =~ /^\s+Build ID: ([0-9a-f]{2})([0-9a-f]+)$/m) {
+       if (! compat(8) && 
+           `readelf -n $file`=~ /^\s+Build ID: ([0-9a-f]{2})([0-9a-f]+)$/m) {
                $debug_path=$desttmp."/usr/lib/debug/.build-id/$1/$2.debug"
        }
        else {