summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-05-08 13:33:22 -0400
committerJoey Hess <joey@kitenet.net>2012-05-08 13:33:22 -0400
commit6401411bde8699d328883e90d59c795da589a482 (patch)
tree4ae4910b886a3b8e07d31ee39d0411d4537cae7d
parent78d19e6a5e190b7a10aec57ecd9af94842f51d5e (diff)
dh_install: Reorder documentation for clarity. Closes: #672109
-rw-r--r--debian/changelog1
-rwxr-xr-xdh_install10
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 97b796d..b014ea9 100644
--- 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_install: Reorder documentation for clarity. Closes: #672109
-- Joey Hess <joeyh@debian.org> Tue, 24 Apr 2012 11:52:22 -0400
diff --git a/dh_install b/dh_install
index c9b47bd..fad3d92 100755
--- 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).
+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
@@ -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/>.
-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.