r2003: * Add some checks for attempts to act on packages not defined in the control

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 54c42ce1b8945d463d497afbdd0b21a15c3be3a5..dad0165c585ee7bca201e28ef30ee09f459c587f 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_shlibdeps - calculate shared library dependancies
+dh_shlibdeps - calculate shared library dependencies
 
 =cut
 
@@ -17,7 +17,7 @@ B<dh_shlibdeps> [S<I<debhelper options>>] [B<-L>I<package>] [B<-l>I<directory>]
 =head1 DESCRIPTION
 
 dh_shlibdeps is a debhelper program that is responsible for calculating
-shared library dependancies for packages.
+shared library dependencies for packages.
 
 This program is merely a wrapper around L<dpkg-shlibdeps(1)> that calls it
 once for each package listed in the control file, passing it
@@ -36,7 +36,7 @@ Pass "params" to L<dpkg-shlibdeps(1)>.
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude files that contain "item" anywhere in their filename from being
-passed to dpkg-shlibdeps. This will make their dependancies be ignored.
+passed to dpkg-shlibdeps. This will make their dependencies be ignored.
 This may be useful in some situations, but use it with caution. This option
 may be used more than once to exclude more than one thing.
 
@@ -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}}) {
@@ -127,8 +124,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) {
                        @opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs"));
                }
+               
+               push @opts, "-tudeb" if is_udeb($package);
+               
+               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}) {
+                       if (defined $ld_library_path_orig) {
+                               $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+                       }
+                       else {
+                               delete $ENV{LD_LIBRARY_PATH};
+                       }
+               }
        }
 }