diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-02 12:29:31 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-02 12:29:31 -0400 |
commit | 9b758456f806e9813e2b7b91d7596c63b63f55ae (patch) | |
tree | 0d0c9607e0e3e7f0028207ac638eac6b02bf07d0 | |
parent | 83066659cc06d097057dd08d09d674cdcdac8b52 (diff) | |
parent | c61fa90d6566fda54f6bf7b092e397ddf000809f (diff) |
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
-rw-r--r-- | debian/changelog | 13 | ||||
-rwxr-xr-x | dh_install | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 737ceca4..e33f170d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +debhelper (7.3.1) experimental; urgency=low + + * Merged debhelper 7.2.20. + + -- Joey Hess <joeyh@debian.org> Thu, 02 Jul 2009 12:28:55 -0400 + debhelper (7.3.0) experimental; urgency=low * Modular object oriented dh_auto_* buildsystem support, @@ -29,6 +35,13 @@ debhelper (7.3.0) experimental; urgency=low -- Joey Hess <joeyh@debian.org> Wed, 01 Jul 2009 15:31:20 -0400 +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:17:42 -0400 + debhelper (7.2.19) unstable; urgency=low * dh_install: Handle correctly the case where a glob expands to @@ -171,7 +171,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; } |