summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2005-09-07 19:33:34 +0000
committerjoey <joey>2005-09-07 19:33:34 +0000
commit2632e573ecb8d02576e17c8ab94b469a3c30f993 (patch)
tree33d572a0c62882209502afc2d32ca247929751ec
parentf86a603fb6be7944e4b9da327a738e8c023e13f5 (diff)
r1785: * dh_shlibdeps: Avoid a use strict warning in some cases if
LD_LIBRARY_PATH is not set.
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_shlibdeps7
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};
+ }
}
}
}