Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog
	dh_auto_configure

diff --cc Debian/Debhelper/Dh_Lib.pm
Simple merge

diff --cc debian/changelog
index 37cd1844f3eaa8a241dc68a12359683ebfc01a15,22bc55bae115e90507b84f25d1deeb46246310cb..b345d4ba6861f5b98da9924188fafc6c77e1856d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,31 +1,48 @@@
 +debhelper (7.3.0) UNRELEASED; urgency=low
 +
 +  * Modular object oriented dh_auto_* buildsystem support,
 +    contributed by Modestas Vainius
 +    - 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.11) UNRELEASED; urgency=low
+ 
+   * dh: Support --with addon,addon,...
+     Closes: #528178
+ 
+  -- Joey Hess <joeyh@debian.org>  Mon, 11 May 2009 14:50:33 -0400
+ 
+ debhelper (7.2.10) unstable; urgency=low
+ 
+   * Close COMPAT_IN filehandle. Closes: #527464
+   * dh_auto_configure: Clarify man page re adding configure
+     parameters. Closes: #527256
+   * dh_auto_configure: Pass packlist=0 when running Makefile.PL,
+     in case it is a Build.PL passthru, to avoid it creating
+     the .packlist file. Closes: #527990
+ 
+  -- Joey Hess <joeyh@debian.org>  Sun, 10 May 2009 13:07:08 -0400
+ 
+ debhelper (7.2.9) unstable; urgency=low
+ 
+   * dh_fixperms: Ensure lintian overrides are mode 644.
+     (Patch from #459548)
+   * dh_fixperms: Fix permissions of OCaml .cmxs files. Closes: #526221
+   * dh: Add --without to allow disabling sequence addons (particularly
+     useful to disable the default python-support addon).
+ 
+  -- Joey Hess <joeyh@debian.org>  Mon, 04 May 2009 14:46:53 -0400
+ 
  debhelper (7.2.8) unstable; urgency=low
  
    * dh_desktop: Now a deprecated no-op, since desktop-file-utils

diff --cc dh_auto_configure
Simple merge