Updated French man page translation. Closes: #685560

[debhelper.git] / dh_strip

diff --git a/dh_strip b/dh_strip
index b4098be6fd23b5164e3c269b09a64aee70dd5c61..ea5315a3b12999cd1b63d956f62ffa1b9ca6a9ca 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -82,18 +82,12 @@ init(options => {
 });
 
 # This variable can be used to turn off stripping (see Policy).
-if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
+if (get_buildoption('nostrip')) {
        exit;
 }
 
-my $objcopy = "objcopy";
-my $strip = "strip";
-# cross-compiling?
-if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
-    ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
-       $objcopy=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-objcopy";
-       $strip=dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-strip";
-}
+my $objcopy = cross_command("objcopy");
+my $strip = cross_command("strip");
 
 # I could just use `file $_[0]`, but this is safer
 sub get_file_type {
@@ -167,12 +161,24 @@ 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;
+       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 {
+               $debug_path=$desttmp."/usr/lib/debug/".$base_file;
+       }
        my $debug_dir=dirname($debug_path);
        if (! -d $debug_dir) {
                doit("install", "-d", $debug_dir);
        }
-       doit($objcopy, "--only-keep-debug", $file, $debug_path);
+       if (compat(8)) {
+               doit($objcopy, "--only-keep-debug", $file, $debug_path);
+       }
+       else {
+               doit($objcopy, "--only-keep-debug", "--compress-debug-sections", $file, $debug_path);
+       }
        # No reason for this to be executable.
        doit("chmod", 644, $debug_path);
        return $debug_path;
@@ -215,7 +221,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        foreach (@shared_libs) {
                my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug;
                # Note that all calls to strip on shared libs
-               # *must* inclde the --strip-unneeded.
+               # *must* include the --strip-unneeded.
                doit($strip,"--remove-section=.comment",
                        "--remove-section=.note","--strip-unneeded",$_);
                attach_debug($_, $debug_path) if defined $debug_path;