From 2632e573ecb8d02576e17c8ab94b469a3c30f993 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 7 Sep 2005 19:33:34 +0000 Subject: r1785: * dh_shlibdeps: Avoid a use strict warning in some cases if LD_LIBRARY_PATH is not set. --- debian/changelog | 7 +++++++ dh_shlibdeps | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cacc5cb..8e147436 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 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 c36abb46..b5b0ff5c 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}; + } } } } -- cgit v1.2.3