summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-02 12:29:31 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-02 12:29:31 -0400
commit9b758456f806e9813e2b7b91d7596c63b63f55ae (patch)
tree0d0c9607e0e3e7f0028207ac638eac6b02bf07d0 /debian
parent83066659cc06d097057dd08d09d674cdcdac8b52 (diff)
parentc61fa90d6566fda54f6bf7b092e397ddf000809f (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 737ceca..e33f170 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