From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 30 Jun 2009 16:56:42 +0000 (-0400)
Subject: dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to put files inside... 
X-Git-Tag: 7.2.19~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e45749314e98a3304b1f845884ac50327c29cc10;p=debhelper.git

dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to put files inside a debian/tmp directory in the package build directory, now that prefix is stripped. (See #534565)

(This also includes a fix to avoid doubled slashes in paths passed to
commands.)
---

diff --git a/debian/changelog b/debian/changelog
index 85cdfe8..80872c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ 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
+  * dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to
+    put files inside a debian/tmp directory in the package build directory,
+    now that prefix is stripped. (See #534565)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 30 Jun 2009 12:46:22 -0400
 
diff --git a/dh_install b/dh_install
index 3d9a562..1ea2c70 100755
--- a/dh_install
+++ b/dh_install
@@ -113,7 +113,7 @@ init(options => {
 my @installed;
 
 my $srcdir = '.';
-$srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR};
+$srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR};
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
@@ -166,11 +166,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			if (! defined $dest) {
 				# Guess at destination directory.
 				$dest=$src;
-				my $strip=$srcdir;
-				if ($strip eq '.') {
-					$strip = "debian/tmp";
-				}
-				$dest=~s/^(.*\/)?\Q$strip\E//;
+				$dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///;
 				$dest=dirname($dest);
 				$tmpdest=1;
 			}