Merge branch 'master' into buildsystems

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 66b88abde31d2f34d252dd97d78e9d749ec69cd9..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
@@ -21,10 +27,38 @@ debhelper (7.3.0) UNRELEASED; urgency=low
   * Move two more command-specific options to only be accepted by the commands
     that use them. The options are:
     --sourcedir, --destdir
-  * If any third-party debhelper commands use either of the above options,
+    If any third-party debhelper commands use either of the above options,
     they will be broken, and need to be changed to pass options to init().
+  * Make dh not complain about unknown, command-specific options passed to it,
+    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>  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
+
+  * dh_install: Handle correctly the case where a glob expands to
+    a dangling symlink, installing the dangling link as requested.
+    Closes: #534565
+  * dh_install: Fix fallback use of debian/tmp in v7 mode; a bug caused
+    it to put files inside a debian/tmp directory in the package build
+    directory, now that prefix is stripped. (See #534565)
 
- -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 16:26:08 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 30 Jun 2009 12:56:52 -0400
 
 debhelper (7.2.18) unstable; urgency=low
 
@@ -47,7 +81,7 @@ debhelper (7.2.17) unstable; urgency=low
     the new system also requires they have START-INFO-DIR-ENTRY and
     END-INFO-DIR-ENTRY for proper registration. I assume there will be
     some mass bug filing for any packages that do not have that.
-    Closes: #528864, #357434
+    Closes: #534639, #357434
 
  -- Joey Hess <joeyh@debian.org>  Fri, 26 Jun 2009 09:02:51 -0400