(This also includes a fix to avoid doubled slashes in paths passed to
commands.)
* 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
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);
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;
}