r99: Initial Import

diff --git a/debian/changelog b/debian/changelog
index d0fe1b6667aaf19b7d03f45642c564addd41e6df..f64479f57d8509e476a34f4a49e3ddf8e70fca98 100644 (file)
--- 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 34ea0d4628f1606d348b34f7842ed76df0f231f6..6187fd31e45e806192217e10bd2fb26b59c2e235 100755 (executable)
--- 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 c2aa9e028450ecc6d7929d9901d13a06777b77e3..a5669bfce5ddfb7855fcf4b27fc3ce4cc7afacc6 100755 (executable)
--- 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