r61: Initial Import

5 files changed, 19 insertions, 4 deletions

diff --git a/README b/README
index bb4b6f06..fc9f95db 100644
--- a/README
+++ b/README
@@ -132,5 +132,13 @@ binary package the debhelper program will act on. For example:
 
 This uses debian/tmp-<package> as the package build directory.
 
+Other notes:
+-----------
+
+* In general, if any debhelper program needs a directory to exist under
+  debian/, it will create it. I haven't bothered to document this in all the
+  man pages, but for example, dh_installdeb knows to make debian/tmp/DEBIAN/
+  before trying to put files there, dh_installmenu knows you need a
+  debian/tmp/usr/lib/menu/ before installing the menu files, etc.
 
 -- Joey Hess <joeyh@master.debian.org>
diff --git a/debian/changelog b/debian/changelog
index a2e73ab6..f742500b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.65) unstable; urgency=low
+
+  * dh_installdocs.1, dh_movefiles.1: cleaified documentation for Che.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  2 Mar 1998 17:20:39 -0800
+
 debhelper (0.64) unstable; urgency=low
 
   * Removed some junk (a whole old debhelper source tree!) that had gotten
diff --git a/dh_movefiles b/dh_movefiles
index 9190853c..939f38c8 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -13,8 +13,8 @@ for PACKAGE in $DH_DOPACKAGES; do
 
 	# debian/files has a different purpose, so ignore it.
 	if [ "$files" -a "$files" != "debian/files" ]; then
-		if [ "$PACKAGE" = "$MAINPACKAGE" ]; then
-			error "I was asked to move some files from $PACKAGE into itself."
+		if [ "$TMP" = "debian/tmp" ]; then
+			error "I was asked to move some files from debian/tmp to debian/tmp."
 		fi
 
 		if [ ! -d "$TMP" ]; then
diff --git a/dh_movefiles.1 b/dh_movefiles.1
index cdda662e..c7e81832 100644
--- a/dh_movefiles.1
+++ b/dh_movefiles.1
@@ -11,7 +11,8 @@ if your package has a Makefile that installs everything into debian/tmp, and
 you need to break that up into subpackages.
 .P
 Files named debian/package.files list the files to be moved, separated by
-whitespace. The filenames listed should be relative to debian/tmp/.
+whitespace. The filenames listed should be relative to debian/tmp/. You can
+also list directory names, and the whole directory will be moved.
 .SH OPTIONS
 .TP
 .B \-v, \--verbose
diff --git a/dh_testversion.1 b/dh_testversion.1
index f385a8ca..5fb7332b 100644
--- a/dh_testversion.1
+++ b/dh_testversion.1
@@ -25,7 +25,7 @@ dpkg --help.
 .TP
 .B version
 Version number to compare against the current version of debhelper. If not
-specified, dh_testroot does nothing.
+specified, dh_testversion does nothing.
 .SH EXAMPLES
 .TP
 .I dh_testversion 0.50