r51: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 3a5a920000e62dff948cbb7d42f888a07257ab36..d705d724a14dba164e0ab5ce51e250887f89a598 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (0.55) unstable; urgency=low
+
+  * dh_clean: delete substvarsfiles probperly again (broken in 0.53). #17077
+  * Added call to dh_movefiles, and a commented out call to dh_testversion,
+    to some of the sample rules files. #17076
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed, 14 Jan 1998 12:48:43 -0500
+
 debhelper (0.54) unstable; urgency=low
 
   * dh_lib: no longer call getopt(1) to parse options. I wrote my own

diff --git a/dh_compress b/dh_compress
index 58eb30f4d92ba103fb417ed9d03d6e6c0c2aaf2c..5af172c833e57547c98bd3567bfd3edd347aa6ac 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -18,14 +18,15 @@ for PACKAGE in $DH_DOPACKAGES; do
        if [ "$compress" ]; then
                # The config file is a sh script that outputs the files to be compressed
                # (typically using find).
-               files=`sh $olddir/$compress 2>/dev/null`
+               files=`sh $olddir/$compress 2>/dev/null ; true`
        else
                # By default fall back on what the policy manual says to compress.
                files=`
                        find usr/info usr/man usr/X11*/man -type f 2>/dev/null ;
                        find usr/doc -type f \( -size +4k -or -name "changelog*" \) \
                                ! -name "*.htm*" ! -name "*.gif" \
-                               ! -name "copyright" 2>/dev/null
+                               ! -name "copyright" 2>/dev/null ;
+                       true
                        `
        fi