dh_install: Fix support for the case where debian/tmp is explicitly specified in...

diff --git a/debian/changelog b/debian/changelog
index 185afb8fe34529bb1049d7ffcd479f7ab38ca305..b62e78d902777fa97c070958f08a5a4d9658e007 100644 (file)
--- 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 eb196e5cb07c466837efb85dc38f52e1d8793955..d01e3bcf76e0647243ce5c2f309a00e77b89758d 100755 (executable)
--- 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;
                        }