Merge branch 'dh_overrides'

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 257a547657982735ae972796deebb16d6e95b779,2f7f73c689d7505fdf0b3ef73171383d79ecb93f..b1199feb713501d9d254f2ac6cfd353bff10717c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,61 -1,10 +1,74 @@@
++debhelper (7.2.1) experimental; urgency=low
++
++  * Merged debhelper 7.0.52.
++
++ -- Joey Hess <joeyh@debian.org>  Sat, 28 Feb 2009 20:01:22 -0500
++
 +debhelper (7.2.0) experimental; urgency=low
 +
 +  * Merged debhelper 7.0.50.
 +  * dh: Fix typo. Closes: #509754
 +  * debhelper.pod: Fix typo. Closes: #510180
 +  * dh_gconf: Support mandatory settings. Closes: #513923
 +  * Improve error messages when child commands fail.
 +  * Depend on dpkg-dev 1.14.19, the first to support Package-Type
 +    fields in dpkg-gencontrol.
 +  * dh_gencontrol: No longer need to generate the udeb filename
 +    when calling dpkg-gencontrol.
 +  * dh_gencontrol: Do not need to tell dpkg-gencontol not to
 +    include the Homepage field in udebs (fixed in dpkg-dev 1.14.17).
 +
 + -- Joey Hess <joeyh@debian.org>  Thu, 26 Feb 2009 18:33:44 -0500
 +
 +debhelper (7.1.1) experimental; urgency=low
 +
 +  * dh_install(1): Order options alphabetically. Closes:# 503896
 +  * Fix some docs that refered to --srcdir rather than --sourcedir.
 +    Closes: #504742
 +  * Add Vcs-Browser field. Closes: #507804
 +  * Ignore unknown options in DH_OPTIONS. Debhelper will always ignore
 +    such options, even when unknown command-line options are converted back
 +    to an error. This allows (ab)using DH_OPTIONS to pass command-specific
 +    options.
 +    (Note that getopt will warn about such unknown options. Eliminating this
 +    warning without reimplementing much of Getopt::Long wasn't practical.)
 +
 + -- Joey Hess <joeyh@debian.org>  Sun, 14 Dec 2008 23:19:27 -0500
 +
 +debhelper (7.1.0) experimental; urgency=low
 +
 +  * dh_installchangelogs: Fall back to looking for changelog files ending
 +    with ".txt". Closes: #498460
 +  * dh_gencontrol: Ensure misc:Depends is set in substvars to avoid dpkg
 +    complaining about it when it's empty. Closes: #498666
 +  * dh: Fix typo in example. Closes: #500836
 +  * Allow individual debhelper programs to define their own special options
 +    by passing a hash to init(), which is later passed on the Getopt::Long. 
 +    Closes: #370823
 +  * Move many command-specific options to only be accepted by the command
 +    that uses them. Affected options are:
 +    -x, -r, -R, -l, -L, -m,
 +    --include-conffiles, --no-restart-on-upgrade, --no-start,
 +    --restart-after-upgrade, --init-script, --filename, --flavor, --autodest,
 +    --libpackage, --add-udeb, --dpkg-shlibdeps-params,
 +    --dpkg-gencontrol-params, --update-rcd-params, --major, --remove-d,
 +    --dirs-only, --keep-debug, --version-info, --list-missing, --fail-missing,
 +    --language, --until, --after, --before, --remaining, --with
 +  * If any third-party debhelper commands use any of the above options,
 +    they will be broken, and need to be changed to pass options to init().
 +  * To avoid breaking rules files that pass options to commands that do not
 +    use them, debhelper will now only warn if it encounters an unknown
 +    option. This will be converted back to an error later.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 10 Sep 2008 13:58:00 -0400
 +
+ debhelper (7.0.52) unstable; urgency=low
+ 
+   * dh: Fix make parsing to not be broken by locale settings.
+     Closes: #517617
+ 
+  -- Joey Hess <joeyh@debian.org>  Sat, 28 Feb 2009 19:52:34 -0500
+ 
  debhelper (7.0.51) unstable; urgency=low
  
    * dh: Man page typos. Closes: #517549, #517550

diff --cc dh
Simple merge