Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 737ceca4d97995411fb25046377f56bd01046097,94f405758fb9231f871185c7585ee9d840cc4fa5..e33f170dbab1ef4e328d32d4efe4999b31692f3c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,10 +1,47 @@@
++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
 +    - dh_auto_* --sourcedirectory can now be used to specify a source
 +      directory if sources and/or the whole buildsystem lives elsewhere
 +      than the top level directory. Closes: #530597
 +    - dh_auto_* --builddirectory can now be used to specify a build
 +      directory to use for out of source building, for build systems
 +      that support it. Closes: #480577
 +    - dh_auto_* --buildsystem can now be used to override the autodetected
 +      build system, or force use of a third-party class.
 +    - dh_auto_* --list can be used to list available and selected build
 +      systems.
 +    - Adds support for cmake.
 +    - For the perl_build build system, Build is used consistently
 +      instead of falling back to using the generated Makefile.
 +      Closes: #534332
 +    - Historical dh_auto_* behavior should be preserved despite these
 +      large changes..
 +  * 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,
 +    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.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 --cc dh_install
Simple merge