Merge branch 'master' into smarter-targets

Conflicts:
	debhelper.pod
	debian/changelog

diff --cc debhelper.pod
index 301f0472663019fa59f9143d6781eba0003005d3,d61cc84da057334d4982c9a40c4cfc5e1f762679..d54bf4e1daf1bb909067a9b1fc63d35c64d29c25
--- 1/debhelper.pod
--- 2/debhelper.pod
+++ b/debhelper.pod
@@@ -552,9 -552,9 +552,14 @@@ ${misc:Pre-Depends
  
  =item -
  
 -B<dh_auto_configure> does not include the source package name
 +dh supports use of standard targets in debian/rules without needing
 +to manually define the dependencies between targets there.
 +
++=item -
++
++<dh_auto_configure> does not include the source package name
+ in --libexecdir when using autoconf.
+ 
  =back
  
  =back

diff --cc debian/changelog
index a626a3e47742eedf60c142f156a78952c5c139b5,35692dadac02f86f0f71527b5b2fc3f8eebdc49d..d22e50eac02de62b76701cb9936604d671351a1d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -3,11 -3,8 +3,13 @@@ 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
  
   -- Joey Hess <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400