diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_shlibdeps | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 9cacc5c..8e14743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (4.9.9) UNRELEASED; urgency=low + + * dh_shlibdeps: Avoid a use strict warning in some cases if + LD_LIBRARY_PATH is not set. + + -- Joey Hess <joeyh@debian.org> Wed, 7 Sep 2005 15:32:53 -0400 + debhelper (4.9.8) unstable; urgency=low * Spelling patch from Kumar Appaiah. Closes: #324892 diff --git a/dh_shlibdeps b/dh_shlibdeps index c36abb4..b5b0ff5 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -135,7 +135,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}; + } } } } |