Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

diff --cc debian/changelog
index b948ec424b2a83fd3db76e41bfb89ef1262e9d3d,a82d4c629274d31ec84942539ec8751ff30d92ed..bd72d497c78ce302623a7c111348c44649dc1f40
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,10 +1,33 @@@
 +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 in other
 +      but 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..
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 16:26:08 -0400
 +
+ debhelper (7.2.18) UNRELEASED; urgency=low
+ 
+   * dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps
+     prints a confusing warning if it does not. Closes: #534226
+ 
+  -- Joey Hess <joeyh@debian.org>  Sun, 28 Jun 2009 15:59:11 -0400
+ 
  debhelper (7.2.17) unstable; urgency=low
  
    * Allow command-specific options to be passed to commands