dh_install: Handle correctly the case where a glob expands to a dangling symlink...

diff --git a/debian/changelog b/debian/changelog
index 941331d1e884a521f714f7e5d85274f05e62fcc9..85cdfe8970be78302094ab8ab59526545edad4be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (7.2.19) UNRELEASED; urgency=low
+
+  * dh_install: Handle correctly the case where a glob expands to
+    a dangling symlink, installing the dangling link as requested.
+    Closes: #534565
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 30 Jun 2009 12:46:22 -0400
+
 debhelper (7.2.18) unstable; urgency=low
 
   * dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps

diff --git a/dh_install b/dh_install
index c83ec81bb24aef0c79f05ca9e6e0b6441271cd2f..3d9a562d8a49db9a6ed6bb938dd0bebe27d072fb 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -147,7 +147,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        my @found = glob "$srcdir/$glob";
                        if (! compat(6)) {
                                # Fall back to looking in debian/tmp.
-                               if (! @found || ! -e $found[0]) {
+                               if (! @found || ! (-e $found[0] || -l $found[0])) {
                                        @found = glob "debian/tmp/$glob";
                                }
                        }