diff options
| -rw-r--r-- | Debian/Debhelper/Dh_Getopt.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_strip | 14 |
3 files changed, 16 insertions, 8 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index d1e052af..6f95dd35 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -121,6 +121,7 @@ sub parseopts { "k" => \$options{K_FLAG}, "keep" => \$options{K_FLAG}, + "keep-debug" => \$options{K_FLAG}, "P=s" => \$options{TMPDIR}, "tmpdir=s" => \$options{TMPDIR}, @@ -169,8 +170,6 @@ sub parseopts { "name=s" => \$options{NAME}, - "keep-debug" => \$options{KEEP_DEBUG}, - "error-handler=s" => \$options{ERROR_HANDLER}, "add-udeb=s" => \$options{SHLIBS_UDEB}, diff --git a/debian/changelog b/debian/changelog index 23a45ef3..6b5b8ea4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (6.0.4) UNRELEASED; urgency=low + + * dh_strip: Improve the idempotency fix put in for #380314. + * dh_strip: The -k flag didn't work (--keep did). Fix. + + -- Joey Hess <joeyh@debian.org> Thu, 24 Jan 2008 21:39:37 -0500 + debhelper (6.0.3) unstable; urgency=low * dh_link: -X can be used to avoid it modifying symlinks to be compliant @@ -149,6 +149,10 @@ sub make_debug { my $file=shift; my $tmp=shift; my $desttmp=shift; + + # Don't try to copy debug symbols out if the file is already + # stripped. + return unless get_file_type($file) =~ /not stripped/; my ($base_file)=$file=~/^\Q$tmp\E(.*)/; my $debug_path=$desttmp."/usr/lib/debug/".$base_file; @@ -156,9 +160,7 @@ sub make_debug { if (! -d $debug_dir) { doit("install", "-d", $debug_dir); } - if (! -e $debug_path) { - doit("objcopy", "--only-keep-debug", $file, $debug_path); - } + doit("objcopy", "--only-keep-debug", $file, $debug_path); # No reason for this to be executable. doit("chmod", 644, $debug_path); return $debug_path; @@ -174,7 +176,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); # Support for keeping the debugging symbols in a detached file. - my $keep_debug=$dh{KEEP_DEBUG}; + my $keep_debug=$dh{K_FLAG}; my $debugtmp=$tmp; if (! compat(4)) { if (ref $dh{DEBUGPACKAGES}) { @@ -204,14 +206,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # *must* inclde the --strip-unneeded. doit("strip","--remove-section=.comment", "--remove-section=.note","--strip-unneeded",$_); - attach_debug($_, $debug_path) if $keep_debug; + attach_debug($_, $debug_path) if defined $debug_path; } foreach (@executables) { my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug; doit("strip","--remove-section=.comment", "--remove-section=.note",$_); - attach_debug($_, $debug_path) if $keep_debug + attach_debug($_, $debug_path) if defined $debug_path; } foreach (@static_libs) { |