r1872: * dh_shlibdeps: pass -tudeb to dpkg-shlibdeps for udebs. Closes: #345472

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index a780638894cd51305332e475a3231291df0c0499..dad0165c585ee7bca201e28ef30ee09f459c587f 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -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.
 
@@ -125,6 +125,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        @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};
@@ -135,7 +137,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        @opts,@{$dh{U_PARAMS}},@filelist);
 
                if ($dh{L_PARAMS}) {
-                       $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+                       if (defined $ld_library_path_orig) {
+                               $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+                       }
+                       else {
+                               delete $ENV{LD_LIBRARY_PATH};
+                       }
                }
        }
 }