From f2bd791e8b07447e395e018331ff1f8c7757b4d6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Jul 2009 17:08:23 -0400 Subject: [PATCH] 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 --- debian/changelog | 8 ++++++++ dh_install | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ebf2f4..fd780c8 100644 --- 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 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 2a5a591..eb196e5 100755 --- 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; } -- 2.39.5