diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-06-30 12:56:42 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-06-30 12:56:42 -0400 |
commit | e45749314e98a3304b1f845884ac50327c29cc10 (patch) | |
tree | f9751a933a3fabbdf08c5470995447a2f39403c0 | |
parent | f94b4b1aea929a8af7d093a118a570f8739b9574 (diff) |
dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to put files inside a debian/tmp directory in the package build directory, now that prefix is stripped. (See #534565)
(This also includes a fix to avoid doubled slashes in paths passed to
commands.)
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | dh_install | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 85cdfe89..80872c60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ debhelper (7.2.19) UNRELEASED; urgency=low * dh_install: Handle correctly the case where a glob expands to a dangling symlink, installing the dangling link as requested. Closes: #534565 + * dh_install: Fix use of debian/tmp in v7 mode; a bug caused it to + put files inside a debian/tmp directory in the package build directory, + now that prefix is stripped. (See #534565) -- Joey Hess <joeyh@debian.org> Tue, 30 Jun 2009 12:46:22 -0400 @@ -113,7 +113,7 @@ init(options => { my @installed; my $srcdir = '.'; -$srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR}; +$srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR}; foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); @@ -166,11 +166,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! defined $dest) { # Guess at destination directory. $dest=$src; - my $strip=$srcdir; - if ($strip eq '.') { - $strip = "debian/tmp"; - } - $dest=~s/^(.*\/)?\Q$strip\E//; + $dest=~s/^(.*\/)?(\Q$srcdir\E|debian\/tmp)\///; $dest=dirname($dest); $tmpdest=1; } |