Merge branch 'master' into smarter-targets

Conflicts:
	dh

diff --cc debhelper.pod
Simple merge

diff --cc debian/changelog
index d22e50eac02de62b76701cb9936604d671351a1d,fb01bc65d27762f53c75f54cfbbc3ccd0ddb9ab6..9bf728aff09ddb474a4dd6eca618f5c8550b3714
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,13 -3,14 +3,19 @@@ debhelper (8.1.7) UNRELEASED; urgency=l
    * Fix example. Closes: #627534
    * Fix error message. Closes: #628053
    * dh_movefiles: Optimise use of xargs. Closes: #627737
 +  * dh: In v9, any standard rules file targets, including build-arch,
 +    build-indep, build, install, etc, can be defined in debian/rules
 +    without needing to explicitly tell make the dependencies between
 +    the targets. Closes: #629139
 +    (Thanks, Roger Leigh)
    * dh_auto_configure: In v9, does not include the source package name
      in --libexecdir when using autoconf. Closes: #541458
+   * dh_auto_build, dh_auto_configure, dh: Set environment variables
+     listed by dpkg-buildflags --export. Any environment variables that
+     are already set to other values will not be changed.
+     Closes: #544844
+   * Also, support DEB_BUILD_OPTIONS=noopt, by changing -O2 to -O0
+     in any variables listed by dpkg-buildflags.
  
   -- Joey Hess <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400
  

diff --cc dh
index 8d8c920a18d69e67854a8aa299098a4926e987d2,7c53611a60827ed1837a84a3aaf783d4be60a07b..aba8c270efb29d8bc9c4ebbcec67e14775d63b58
--- 1/dh
--- 2/dh
+++ b/dh
@@@ -275,9 -273,9 +275,12 @@@ that is in the specified sequence. It t
  in the sequence. The B<--until>, B<--before>, B<--after>, and B<--remaining>
  options can override this behavior.
  
 +A sequence can also run dependent targets in debian/rules.  For
 +example, the "binary" sequence runs the "install" target.
 +
+ B<dh> sets environment variables listed by B<dpkg-buildflags>, unless
+ they are already set. It supports DEB_BUILD_OPTIONS=noopt too.
+ 
  B<dh> uses the B<DH_INTERNAL_OPTIONS> environment variable to pass information
  through to debhelper commands that are run inside override targets. The
  contents (and indeed, existence) of this environment variable, as the name