r90: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 123204f8682f9e7bf16ef384bab6aba579d46982..e37b9d76b45dbc270e6ce937502136e7b817d5bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (0.93) unstable; urgency=low
+
+  * Depend on file, since several dh_*'s use it.
+
+ -- Joey Hess <joeyh@master.debian.org>  Fri, 19 Jun 1998 21:43:51 -0700
+
 debhelper (0.92) unstable; urgency=low
 
   * dh_gencontrol: pass -isp to dpkg-gencontrol to make it include section

diff --git a/dh_md5sums b/dh_md5sums
index 40cb7ab88ad3c38d97ed601ae10c7c0d9d88e620..9c47a90b46dd6b6e47a2685676c8d7cdffebed5e 100755 (executable)
--- a/dh_md5sums
+++ b/dh_md5sums
@@ -13,15 +13,15 @@ for PACKAGE in $DH_DOPACKAGES; do
                doit "install -d $TMP/DEBIAN"
        fi
 
-       complex_doit "find $TMP/* -type f ! -regex '^$TMP/DEBIAN/.*' | sed s:$TMP:: | sort > $TMP/DEBIAN/allfiles"
        # Check if we should exclude conffiles.
        if [ ! "$DH_INCLUDE" -a -r $TMP/DEBIAN/conffiles ]; then
-               complex_doit "sort $TMP/DEBIAN/conffiles | comm -13 - $TMP/DEBIAN/allfiles > $TMP/DEBIAN/allfiles.new"
-               doit "mv $TMP/DEBIAN/allfiles.new $TMP/DEBIAN/allfiles"
+               # Generate exclude regexp. Using perl here may be overkill,
+               # but it does insure conffiles with spaces in them work.
+               exclude=`perl -ne 'chomp; s/^\///; print "! -path \"$_\" "' $TMP/DEBIAN/conffiles`
        fi
+
        olddir=`pwd`
-       complex_doit "cd $TMP ; sed 's:^/::' < DEBIAN/allfiles | xargs md5sum > DEBIAN/md5sums ; cd $olddir"
+       complex_doit "cd $TMP ; find * -type f $exclude ! -regex '^DEBIAN/.*' -print0 | xargs -0 md5sum > DEBIAN/md5sums ; cd $olddir"
        doit "chmod 644 $TMP/DEBIAN/md5sums"
        doit "chown root.root $TMP/DEBIAN/md5sums"
-       doit "rm -f $TMP/DEBIAN/allfiles"
 done