r98: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 136bf0f0505615834339f75ea703c131ab736c4f..d0fe1b6667aaf19b7d03f45642c564addd41e6df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.99.2) unstable; urgency=low
+
+  * dh_movefiles: allow passing of files to move on the command line. Only
+    rarely does this make sense. (#25197)
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 30 Jul 1998 10:38:34 -0700
+
 debhelper (0.99.1) unstable; urgency=low
 
   * dh_installcron: now supports /etc/cron.d (#25112).

diff --git a/dh_movefiles.1 b/dh_movefiles.1
index b36d3dd51d1926123a04239bad4f3f798a2f523a..1c27f9683f578a620139ea37857da283a0477cda 100644 (file)
--- a/dh_movefiles.1
+++ b/dh_movefiles.1
@@ -14,8 +14,8 @@ Files named debian/package.files list the files to be moved, separated by
 whitespace. The filenames listed should be relative to debian/tmp/. You can
 also list directory names, and the whole directory will be moved. You can
 even use wildcards if you like. If you prefer, you can list the files to
-move on the command line. However, this will only work if the first package
-dh_movefiles is told to act on is a subpackage (ie, via -p).
+move on the command line and this will apply to the first package
+dh_movefiles is told to act on.
 .P
 The files will be moved in a special order: first all normal files, then all
 symlinks. This is done becuase it tends to be a good thing to have symlinks
@@ -39,7 +39,7 @@ will output a list of what it would have done.
 Move files for the package named "package".
 .TP
 .B \-Ptmpdir, \--tmpdir=tmpdir
-Use "tmpdir" for package build directory. 
+Use "tmpdir" for package build directory.
 .TP
 .B file ..
 Lists files to move. The filenames listed should be relative to debian/tmp/.