Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index b68e6d24158f1cf95237186af6e888d6de686420..fda835276526e943fa047abb95b5c68b5ad8aaff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,14 @@ debhelper (7.3.0) experimental; urgency=low
 
  -- Joey Hess <joeyh@debian.org>  Wed, 01 Jul 2009 15:31:20 -0400
 
+debhelper (7.2.22) unstable; 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:08:25 -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 c5647c6b7ba693b28a9edeed17941c2f768e12b8..a8e08c2ab85400ad4e2371af8485b5323f0820bb 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -170,7 +170,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;
                        }