r1785: * dh_shlibdeps: Avoid a use strict warning in some cases if

  LD_LIBRARY_PATH is not set.

diff --git a/debian/changelog b/debian/changelog
index 9cacc5cb8244f3112471b5ec2e365fd624ebc2e4..8e147436e4b6ea5f5d8e40aa40667e95b4bc6620 100644 (file)
--- 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 c36abb461c5c4ddea0bf448bc891aa5cbaebe4cc..b5b0ff5c7f01f135b4e86719719b9ac92365f433 100755 (executable)
--- 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};
+                       }
                }
        }
 }