From: joey <joey>
Date: Tue, 17 Aug 1999 04:54:35 +0000 (+0000)
Subject: r99: Initial Import
X-Git-Tag: debian_version_0_1~134
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4cc1c968c2cb84135de6c82084a2f775eea4dc3a;p=debhelper.git

r99: Initial Import
---

diff --git a/debian/changelog b/debian/changelog
index d0fe1b6..f64479f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (0.99.3) unstable; urgency=low
+
+  * dh_movefiles: Fixed a over-eager sanity check introduced in the last
+    version.
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon,  3 Aug 1998 18:31:45 -0700
+
 debhelper (0.99.2) unstable; urgency=low
 
   * dh_movefiles: allow passing of files to move on the command line. Only
diff --git a/dh_debstd b/dh_debstd
index 34ea0d4..6187fd3 100755
--- a/dh_debstd
+++ b/dh_debstd
@@ -196,7 +196,10 @@ for PACKAGE in $DH_DOPACKAGES; do
 	for file in postinst postrm preinst prerm; do
 		f="`pkgfile $PACKAGE $file`"
 		if [ "$f" ]; then
-			filelist="$filelist$f "
+			if ! grep -q "#DEBHELPER#" "$f"; then
+				filelist="$filelist$f "
+
+			fi
 		fi
 	done
 done
diff --git a/dh_movefiles b/dh_movefiles
index c2aa9e0..a5669bf 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -25,7 +25,7 @@ for PACKAGE in $DH_DOPACKAGES; do
 		tomove="$* $tomove"
 	fi
 
-	if [ "$tomove" -a "$PACKAGE" = "$MAINPACKAGE" ]; then
+	if [ "$tomove" -a "$TMP" = "debian/tmp" ]; then
 		error "I was asked to move files from debian/tmp to debian/tmp."
 	fi