summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog13
-rwxr-xr-xdh_install2
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
diff --git a/dh_install b/dh_install
index ccec4717..c5647c6b 100755
--- a/dh_install
+++ b/dh_install
@@ -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;
}