dh_install: Fix support for the case where debian/tmp is explicitly specified in filename paths despite being searched by default. Closes: #537140

2 files changed, 11 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 185afb8f..b62e78d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (7.2.23) UNRELEASED; urgency=low
+
+  * dh_install: Fix support for the case where debian/tmp is
+    explicitly specified in filename paths despite being searched by
+    default. Closes: #537140
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 15 Jul 2009 09:23:25 -0400
+
 debhelper (7.2.22) unstable; urgency=low
 
   * dh_install: Fix support for the case where --sourcedir=debian/tmp/foo
diff --git a/dh_install b/dh_install
index eb196e5c..d01e3bcf 100755
--- a/dh_install
+++ b/dh_install
@@ -166,8 +166,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			if (! defined $dest) {
 				# Guess at destination directory.
 				$dest=$src;
-				$dest=~s/^(.*\/)?\Q$srcdir\E\/// ||
-					$dest=~s/^(.*\/)?debian\/tmp\///;
+				$dest=~s/^(.*\/)?\Q$srcdir\E\///;
+				$dest=~s/^(.*\/)?debian\/tmp\///;
+				print ">>$srcdir ($dest)\n";
 				$dest=dirname("/".$dest);
 				$tmpdest=1;
 			}