From a19087a965f37c7aa81f5dcfc417664a2875c734 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Jul 2009 12:17:39 -0400 Subject: [PATCH] dh_install: Fix installation of entire top-level directory from debian/tmp. Closes: #535367 This was broken by the slash removal fix in e45749314e98a3304b1f845884ac50327c29cc10. Of course those unnecessary slashes were actually necessary for dirname to DTRT. --- debian/changelog | 7 +++++++ dh_install | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 51ebd60..7327091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (7.2.20) unstable; urgency=low + + * dh_install: Fix installation of entire top-level directory + from debian/tmp. Closes: #535367 + + -- Joey Hess Thu, 02 Jul 2009 12:14:37 -0400 + debhelper (7.2.19) unstable; urgency=low * dh_install: Handle correctly the case where a glob expands to diff --git a/dh_install b/dh_install index 1ea2c70..2a5a591 100755 --- a/dh_install +++ b/dh_install @@ -167,7 +167,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Guess at destination directory. $dest=$src; $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///; - $dest=dirname($dest); + $dest=dirname("/".$dest); $tmpdest=1; } -- 2.39.5