r1751: releasing version 4.2.34

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index f49300541a1256194cdd9da25ea0e2a2f77342c7..77d8d6a93991edadcce6878dfa90da0e16375d8a 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -55,7 +55,7 @@ a directory that contains the library. See example below.
 =item B<-L>I<package>, B<--libpackage=>I<package>
 
 Use the shlibs file automatically generated by dh_makeshlibs for the named
-package as a kind of automatically generated shlibs.local file. You can us
+package as a kind of automatically generated shlibs.local file. You can use
 this switch in concert with the -l switch to make dpkg-shlibdeps find a
 library built as part of the current package, and get the shlibs information.
 See example below.
@@ -80,7 +80,6 @@ information.
 
 init();
 
-# Add directory to library search path.
 if ($dh{L_PARAMS}) {
        my @paths=();
        # Add to existing paths, if set.
@@ -96,8 +95,6 @@ if ($dh{L_PARAMS}) {
                }
        }
        $dh{L_PARAMS}=join(':', @paths);
-       $ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS};
-       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}");
 }
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -113,7 +110,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
                $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
        }
-       foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" \\) $find_options`)) {
+       foreach my $file (split(/\n/,`find $tmp -path $tmp/usr/lib/debug -prune -or -type f \\( -perm +111 -or -name "*.so*" \\) $find_options -print`)) {
                # TODO this is slow, optimize. Ie, file can run once on
                # multiple files..
                $ff=`file "$file"`;
@@ -127,14 +124,25 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) {
                        @opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs"));
                }
+               
+               my $ld_library_path_orig=$ENV{LD_LIBRARY_PATH};
+               if ($dh{L_PARAMS}) {
+                       $ENV{LD_LIBRARY_PATH}=$dh{L_PARAMS};
+                       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}");
+               }
+               
                doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",
                        @opts,@{$dh{U_PARAMS}},@filelist);
+
+               if ($dh{L_PARAMS}) {
+                       $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+               }
        }
 }
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>, L<dpkg-shlibdeps(1)>
 
 This program is a part of debhelper.