Merge branch 'master' into buildsystems

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 082b0d131870cfdf2a8ae2f7d1942f08d5e24b9d..c1568ee4284c03fd59e7378cfa0b100a4e8a40ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-debhelper (7.3.0) UNRELEASED; urgency=low
+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,
     contributed by Modestas Vainius
@@ -27,7 +33,21 @@ debhelper (7.3.0) UNRELEASED; urgency=low
     and further suppress warnings about such options it passes on to debhelper
     commands. This was attempted incompletely before in version 7.2.17.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 16:26:08 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 01 Jul 2009 15:31:20 -0400
+
+debhelper (7.2.21) unstable; urgency=low
+
+  * Add a versioned dep on perl-base, to get a version that supports
+    GetOptionsFromArray. Closes: #536310
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 08 Jul 2009 21:08:45 -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