dh_install: Fix support for the case where --sourcedir=debian/tmp/foo is used. Perl...

diff --git a/debian/changelog b/debian/changelog
index 3ebf2f4a1a1bab6af07ccaff2d5bf15e658cc9ce..fd780c8cdc7c0c355002ddf3abb49e0bc9f4c351 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (7.2.22) UNRELEASED; urgency=low
+
+  * dh_install: Fix support for the case where --sourcedir=debian/tmp/foo
+    is used. Perl was not being greedy enough and the 'foo' was not stripped
+    from the destination directory in this unusual case. Closes: #537017
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 14 Jul 2009 17:05:26 -0400
+
 debhelper (7.2.21) unstable; urgency=low
 
   * Add a versioned dep on perl-base, to get a version that supports

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