dh: Allow creation of new sequences (such as to handle a patch target for quilt)...

[debhelper.git] / dh_strip

diff --git a/dh_strip b/dh_strip
index 68c7e5ac79b40f5ebf0f59fa05f750521828f343..cfa26653341fc6900527b47640d96bf1867f7a93 100755 (executable)
--- a/dh_strip
+++ b/dh_strip
@@ -48,7 +48,7 @@ Causes dh_strip to save debug symbols stripped from the packages it acts on
 as independent files in the package build directory of the specified debugging
 package.
 
 as independent files in the package build directory of the specified debugging
 package.
 

-For example, if your packages are lifoo and foo and you want to include a
+For example, if your packages are libfoo and foo and you want to include a

 foo-dbg package with debugging symbols, use dh_strip --dbg-package=foo-dbg.
 
 Note that this option behaves significantly different in debhelper
 foo-dbg package with debugging symbols, use dh_strip --dbg-package=foo-dbg.
 
 Note that this option behaves significantly different in debhelper


@@ -68,7 +68,8 @@ is easier to use than this option, but this option is more flexible.
 =head1 NOTES
 
 If the DEB_BUILD_OPTIONS environment variable contains "nostrip", nothing
 =head1 NOTES
 
 If the DEB_BUILD_OPTIONS environment variable contains "nostrip", nothing

-will be stripped, in accordance with Debian policy.
+will be stripped, in accordance with Debian policy (section 10.1
+"Binaries").

 
 =head1 CONFORMS TO
 
 
 =head1 CONFORMS TO
 


@@ -76,7 +77,9 @@ Debian policy, version 3.0.1
 
 =cut
 
 
 =cut
 

-init();
+init(options => {
+       "keep-debug" => \$dh{K_FLAG},
+});

 
 # This variable can be used to turn off stripping (see Policy).
 if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {
 
 # This variable can be used to turn off stripping (see Policy).
 if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nostrip/) {


@@ -112,7 +115,8 @@ sub testfile {
        return if $fn=~m/debug\/.*\.so/;
 
        # Does its filename look like a shared library?
        return if $fn=~m/debug\/.*\.so/;
 
        # Does its filename look like a shared library?

-       if (m/.*\.so.*?/) {
+       # (*.cmxs are OCaml native code shared libraries)
+       if (m/.*\.(so.*?|cmxs$)/) {

                # Ok, do the expensive test.
                my $type=get_file_type($_);
                if ($type=~m/.*ELF.*shared.*/) {
                # Ok, do the expensive test.
                my $type=get_file_type($_);
                if ($type=~m/.*ELF.*shared.*/) {


@@ -148,6 +152,10 @@ sub make_debug {
        my $file=shift;
        my $tmp=shift;
        my $desttmp=shift;
        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;
 
        my ($base_file)=$file=~/^\Q$tmp\E(.*)/;
        my $debug_path=$desttmp."/usr/lib/debug/".$base_file;


@@ -171,14 +179,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
 
        # Support for keeping the debugging symbols in a detached file.
        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}) {
                        $keep_debug=1;
                        # Note that it's only an array for the v4 stuff;
                        # for v5 only one value is used.
        my $debugtmp=$tmp;
        if (! compat(4)) {
                if (ref $dh{DEBUGPACKAGES}) {
                        $keep_debug=1;
                        # Note that it's only an array for the v4 stuff;
                        # for v5 only one value is used.

-                       $debugtmp=tmpdir(@{$dh{DEBUGPACKAGES}}[0]);
+                       my $debugpackage=@{$dh{DEBUGPACKAGES}}[0];
+                       if (! grep { $_ eq $debugpackage } getpackages()) {
+                               error("debug package $debugpackage is not listed in the control file");
+                       }
+                       $debugtmp=tmpdir($debugpackage);

                }
        }
        else {
                }
        }
        else {


@@ -197,14 +209,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # *must* inclde the --strip-unneeded.
                doit("strip","--remove-section=.comment",
                        "--remove-section=.note","--strip-unneeded",$_);
                # *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",$_);
        }
        
        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) {
        }
 
        foreach (@static_libs) {