Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 777bc0d229bedbbf6e1285f17c12e069fae1596f,47a2b5ff0df7bb5db6359c05c6d7c45db27eb7c2..66b88abde31d2f34d252dd97d78e9d749ec69cd9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,4 +1,32 @@@
- debhelper (7.2.18) UNRELEASED; urgency=low
 +debhelper (7.3.0) UNRELEASED; 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().
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 16:26:08 -0400
 +
+ debhelper (7.2.18) unstable; urgency=low
  
    * dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps
      prints a confusing warning if it does not. Closes: #534226