From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 2 Jul 2009 16:17:39 +0000 (-0400)
Subject: dh_install: Fix installation of entire top-level directory from debian/tmp. Closes... 
X-Git-Tag: 7.2.20~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a19087a965f37c7aa81f5dcfc417664a2875c734;p=debhelper.git

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

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 51ebd60..7327091 100644
--- 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 1ea2c70..2a5a591 100755
--- 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;
 			}