Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 021f7877c5a1616c19f90d4ef67c2fc0ac9235e3,994ac4426517096bf553e1558d221ba0136e1159..4fe56307caef24f868be41794bafbb7eb727c536
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,29 +1,49 @@@
 +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.
 +    - 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.16) unstable; urgency=low
+ 
+   * dh_gconf: Add missed half of postrm fragment removal. Closes: #531035
+ 
+  -- Joey Hess <joeyh@debian.org>  Thu, 11 Jun 2009 12:50:33 -0400
+ 
+ debhelper (7.2.15) unstable; urgency=low
+ 
+   * dh_strip, dh_shlibdeps: Add support for OCaml shared libraries.
+     (Stephane Glondu) Closes: #527272, #532701
+   * dh_compress: Avoid compressing .svg and .sgvz files, since these
+     might be used as images on a html page, and also to avoid needing
+     to special case the .svgz extension when compressing svg.
+     Closes: #530253
+   * dh_scrollkeeper: Now a deprecated no-op. Closes: #530806
+   * dh_gconf: Remove postrm fragment that handled schema migration
+     from /etc to /usr. Closes: #531035
+ 
+  -- Joey Hess <joeyh@debian.org>  Wed, 10 Jun 2009 17:14:07 -0400
+ 
+ debhelper (7.2.14) unstable; urgency=low
+ 
+   * dh: Avoid writing log after override_dh_clean is run. Closes: #529228
+ 
+  -- Joey Hess <joeyh@debian.org>  Mon, 18 May 2009 12:49:32 -0400
+ 
  debhelper (7.2.13) unstable; urgency=low
  
    * dh_auto_configure: Pass --skipdeps safely via PERL_AUTOINSTALL.