dh_install: Fix installation of entire top-level directory from debian/tmp. Closes...

This was broken by the slash removal fix in
e45749314e98a3304b1f845884ac50327c29cc10. Of course those
unnecessary slashes were actually necessary for dirname to
DTRT.

diff --git a/debian/changelog b/debian/changelog
index 51ebd60486f4aaac473038113b819f4fed2b701a..73270915c42d47b969727716cd471ced1eb1a345 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.2.20) unstable; urgency=low
+
+  * dh_install: Fix installation of entire top-level directory
+    from debian/tmp. Closes: #535367
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Jul 2009 12:14:37 -0400
+
 debhelper (7.2.19) unstable; urgency=low
 
   * dh_install: Handle correctly the case where a glob expands to

diff --git a/dh_install b/dh_install
index 1ea2c70880675841761e3463d5e5dfa581083b85..2a5a5911832622f605765a1b64280d9fa10660e6 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -167,7 +167,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                # Guess at destination directory.
                                $dest=$src;
                                $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///;
-                               $dest=dirname($dest);
+                               $dest=dirname("/".$dest);
                                $tmpdest=1;
                        }