diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-02 12:17:39 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-02 12:17:39 -0400 |
commit | a19087a965f37c7aa81f5dcfc417664a2875c734 (patch) | |
tree | 2045c32ca5c6a3c2557bc9244eef4542730adc6b | |
parent | 9089acf8dcc683db171f1f5be12c9424cf89aa6f (diff) |
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.
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | dh_install | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 51ebd604..73270915 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 <joeyh@debian.org> 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 @@ -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; } |