Correct docs about dh_install and debian/tmp in v7 mode

* Correct docs about dh_install and debian/tmp in v7 mode. It first looks in
  the current directory, or whatever is configured with --srcdir. Then it
  always falls back to looking in debian/tmp.
* Medium urgency to get this doc fix into testing.

3 files changed, 16 insertions, 7 deletions

diff --git a/debhelper.pod b/debhelper.pod
index 7b276065..e840d31f 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -398,10 +398,10 @@ Changes from V6 are:
 
 =item -
 
-dh_install, if --sourcedir is not specified, will first look for files in
-debian/tmp, and then will look in the current directory. This allows
-dh_install to interoperate with dh_auto_install without needing any special
-parameters.
+dh_install, will fall back to looking for files in debian/tmp if it doesn't
+find them in the current directory (or wherever you tell it look using
+--srcdir). This allows dh_install to interoperate with dh_auto_install,
+which installs to debian/tmp, without needing any special parameters.
 
 =item -
 
diff --git a/debian/changelog b/debian/changelog
index 542c1f7c..2ae4820b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (7.0.12) UNRELEASED; urgency=medium
+
+  * Correct docs about dh_install and debian/tmp in v7 mode. It first looks in
+    the current directory, or whatever is configured with --srcdir. Then it
+    always falls back to looking in debian/tmp.
+  * Medium urgency to get this doc fix into testing.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 25 Jun 2008 03:30:49 -0400
+
 debhelper (7.0.11) unstable; urgency=low
 
   * dh: Man page fix. Closes: #485116
diff --git a/dh_install b/dh_install
index 7a6046ba..cb30d4d7 100755
--- a/dh_install
+++ b/dh_install
@@ -40,9 +40,9 @@ package that builds multiple binary packages. You can use the upstream
 Makefile to install it all into debian/tmp, and then use dh_install to copy
 directories and files from there into the proper package build directories.
 
-From debhelper compatibility level 7 on, if --sourcedir is not specified,
-dh_install will install files from debian/tmp if the directory contains the
-files. Otherwise, it will install files from the current directory.
+From debhelper compatibility level 7 on, dh_install will fall back to
+looking in debian/tmp for files, if it doesn't find them in the current
+directory (or whereever you've told it to look using --srcdir).
 
 =head1 OPTIONS