Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog

diff --cc debian/changelog
index b68e6d24158f1cf95237186af6e888d6de686420,185afb8fe34529bb1049d7ffcd479f7ab38ca305..fda835276526e943fa047abb95b5c68b5ad8aaff
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,11 +1,60 @@@
 +debhelper (7.3.3) UNRELEASED; urgency=low
 +
 +  * Add ant buildsystem support. Closes: #537021
 +
 + -- Joey Hess <joeyh@debian.org>  Tue, 14 Jul 2009 16:35:50 -0400
 +
 +debhelper (7.3.2) experimental; urgency=low
 +
 +  * Merged debhelper 7.2.21.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 08 Jul 2009 21:23:48 -0400
 +
 +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.22) unstable; urgency=low
+ 
+   * dh_install: Fix support for the case where --sourcedir=debian/tmp/foo
+     is used. Perl was not being greedy enough and the 'foo' was not stripped
+     from the destination directory in this unusual case. Closes: #537017
+ 
+  -- Joey Hess <joeyh@debian.org>  Tue, 14 Jul 2009 17:08:25 -0400
+ 
  debhelper (7.2.21) unstable; urgency=low
  
    * Add a versioned dep on perl-base, to get a version that supports

diff --cc dh_install
Simple merge