dh_install: Reorder documentation for clarity. Closes: #672109

diff --git a/debian/changelog b/debian/changelog
index 97b796d326ad2ace40680ccece0491f8f27c8a07..b014ea97ebe99b747d2b7278f8dc91bd7b780118 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ debhelper (9.20120420) UNRELEASED; urgency=low
   * dh_installman: Recognize sections from mdoc .Dt entries. Closes: #670210
     Thanks, Guillem Jover
   * Updated German man page translation. Closes: #671598
   * dh_installman: Recognize sections from mdoc .Dt entries. Closes: #670210
     Thanks, Guillem Jover
   * Updated German man page translation. Closes: #671598

+  * dh_install: Reorder documentation for clarity. Closes: #672109

 
  -- Joey Hess <joeyh@debian.org>  Tue, 24 Apr 2012 11:52:22 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 24 Apr 2012 11:52:22 -0400
 

diff --git a/dh_install b/dh_install
index c9b47bd638e481dc4c6b2c1923b8cd2483e5f14e..fad3d92226c4e96177deda9215d53cacc92cad46 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -49,6 +49,11 @@ relative to the current directory, while the installation directory is given
 relative to the package build directory. You may use wildcards in the names of
 the files to install (in v3 mode and above).
 
 relative to the package build directory. You may use wildcards in the names of
 the files to install (in v3 mode and above).
 

+Note that if you list exactly one filename or wildcard-pattern on a line by
+itself, with no explicit destination, then B<dh_install>
+will automatically guess the destination to use, the same as if the
+--autodest option were used.
+

 =back
 
 =head1 OPTIONS
 =back
 
 =head1 OPTIONS


@@ -100,11 +105,6 @@ filename. So if the filename is F<debian/tmp/usr/bin>, then that directory
 will be copied to F<debian/package/usr/>. If the filename is
 F<debian/tmp/etc/passwd>, it will be copied to F<debian/package/etc/>.
 
 will be copied to F<debian/package/usr/>. If the filename is
 F<debian/tmp/etc/passwd>, it will be copied to F<debian/package/etc/>.
 

-Note that if you list exactly one filename or wildcard-pattern on a line by
-itself in a
-F<debian/package.install> file, with no explicit destination, then B<dh_install>
-will automatically guess the destination even if this flag is not set.
-

 =item I<file|dir> ... I<destdir>
 
 Lists files (or directories) to install and where to install them to.
 =item I<file|dir> ... I<destdir>
 
 Lists files (or directories) to install and where to install them to.