Merge branch 'master' into buildsystems

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 737ceca4d97995411fb25046377f56bd01046097..e33f170dbab1ef4e328d32d4efe4999b31692f3c 100644 (file)
--- 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