From 66086625c0e88fd7bda3600f13cb7b9502c2d502 Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Tue, 17 Aug 1999 04:54:19 +0000
Subject: [PATCH] r97: Initial Import

---
 debian/changelog |  6 ++++++
 dh_movefiles     | 25 +++++++++++++++++--------
 dh_movefiles.1   | 12 ++++++++++--
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88d8c7f..136bf0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.99.1) unstable; urgency=low
+
+  * dh_installcron: now supports /etc/cron.d (#25112).
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 27 Jul 1998 20:18:47 -0700
+
 debhelper (0.99) unstable; urgency=low
 
   * !!!! WARNING: Debhelper (specifically dh_compress) is broken with
diff --git a/dh_movefiles b/dh_movefiles
index 79dc089..c2aa9e0 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -13,18 +13,27 @@ for PACKAGE in $DH_DOPACKAGES; do
 		error "debian/tmp does not exist"
 	fi
 
-	# debian/files has a different purpose, so ignore it.
+	tomove=""
+
+        # debian/files has a different purpose, so ignore it.
 	if [ "$files" -a "$files" != "debian/files" ]; then
-#		if [ "$TMP" = "debian/tmp" ]; then
-#			error "I was asked to move some files from debian/tmp to debian/tmp."
-#		fi
+		tomove=`cat $files`
+	fi
+	
+	if [ \( "$PACKAGE" = "$DH_FIRSTPACKAGE" -o "$DH_PARAMS_ALL" \) \
+	     -a "$*" ]; then
+		tomove="$* $tomove"
+	fi
 
+	if [ "$tomove" -a "$PACKAGE" = "$MAINPACKAGE" ]; then
+		error "I was asked to move files from debian/tmp to debian/tmp."
+	fi
+
+	if [ "$tomove" ]; then
 		if [ ! -d "$TMP" ]; then
 			doit "install -d $TMP"
 		fi
 
-		files=`pwd`/$files
-
 		# Order the files. First all real files, then symlinks. 
 		# Putting symlinks last is a nice thing to do for library 
 		# packages and doesn't affect much of anything else.
@@ -34,10 +43,10 @@ for PACKAGE in $DH_DOPACKAGES; do
 		# The filelist is used, so even very weird filenames can be
 		# moved.
 		doit "rm -f movelist"
-		for i in `(cd debian/tmp ; echo \`cat $files\`)`; do
+		for i in `(cd debian/tmp; echo $tomove)`; do
 			complex_doit "(cd debian/tmp ; find $i ! -type d -and ! -type l -print) >> movelist"
 		done
-		for i in `(cd debian/tmp ; echo \`cat $files\`)`; do
+		for i in `(cd debian/tmp; echo $tomove)`; do
 			complex_doit "(cd debian/tmp ; find $i ! -type d -and -type l -print) >> movelist"
 		done
 		complex_doit "(cd debian/tmp;tar --create --remove-files --files-from=../../movelist --file -) | (cd $TMP;tar xpf -)"
diff --git a/dh_movefiles.1 b/dh_movefiles.1
index 4243758..b36d3dd 100644
--- a/dh_movefiles.1
+++ b/dh_movefiles.1
@@ -3,7 +3,7 @@
 dh_movefiles \- moves files out of debian/tmp into subpackages
 .SH SYNOPSIS
 .B dh_movefiles
-.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir]"
+.I "[-v] [-a] [-i] [--no-act] [-ppackage] [-Ptmpdir] [file ..]"
 .SH "DESCRIPTION"
 dh_movefiles is a debhelper program that is responsible for moving files out
 of debian/tmp and into other package build directories. This may be useful
@@ -13,7 +13,9 @@ you need to break that up into subpackages.
 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.
+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).
 .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
@@ -38,6 +40,12 @@ Move files for the package named "package".
 .TP
 .B \-Ptmpdir, \--tmpdir=tmpdir
 Use "tmpdir" for package build directory. 
+.TP
+.B file ..
+Lists files to move. 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. It is an error to list files here unless
+you use -p, -i, or -a to tell dh_movefiles which subpackage to put them in.
 .SH NOTES
 The
 .B \-a
-- 
2.39.5