r192: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 72475f924b0ae95d86d9cb716aef7accf9de1c3b..fd8190fba03e6b7d813a195c2f93bd74d100be8a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+debhelper (1.2.53) unstable; urgency=low
+
+  * dh_compress: leave .taz and .tgz files alone. Previously trying to
+    compress such files caused gzip to fail and the whole command to fail.
+    Probably fixes #35677. Actually, it now skips files with a whole
+    range of odd suffixes that gzip refuses to compress, including "_z" and
+    "-gz".
+  * dh_compress.1: updated docs to reflect this, and to give the new
+    suggested starting point if you want to write your own debian/compress
+    file.
+
+ -- Joey Hess <joeyh@master.debian.org>  Wed,  7 Apr 1999 02:20:14 -0700
+
 debhelper (1.2.52) unstable; urgency=low
 
   * dh_installmodules: new program, closes #32546.

diff --git a/dh_compress b/dh_compress
index d4ec3cfda591d660286f60f0544fad319779c188..1c1badeb2826627aeb65600da17d4564b804d171 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -31,10 +31,17 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        }
        else {
                # By default, fall back to what the policy manual says to compress.
+               # Note that all the excludes of odd things like _z are because
+               # gzip refuses to compress such files, assumming they are zip files.
+               # I looked at the gzip source to get the complete list of such
+               # extentions. ".gz", ".z", ".taz", ".tgz", "-gz", "-z", "_z"
+               
                push @files, split(/\n/,`
                        find usr/info usr/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true;
                        find usr/doc -type f \\( -size +4k -or -name "changelog*" \\) \\
-                               ! -name "*.htm*" ! -name "*.gif" ! -name "*.gz" \\
+                               ! -name "*.htm*" ! -name "*.gif" ! -iname "*.gz" \\
+                               ! -iname "*.taz" ! -iname "*.tgz" ! -iname "*.z" \\
+                               ! -iname "*-gz" ! -iname "*-z" ! -iname "*_z" \\
                                ! -name "copyright" 2>/dev/null || true
                `);
        }

diff --git a/dh_installinit.1 b/dh_installinit.1
index bef681cbacaac6a2700af15af567be29025f7df7..5ec55fcdd0a4e774519802671fb94521502bd7ad 100644 (file)
--- a/dh_installinit.1
+++ b/dh_installinit.1
@@ -13,7 +13,7 @@ needed to set up the symlinks in /etc/rc*.d/ and to start and stop the init
 scripts.
 .P
 If a file named debian/package.init (or debian/package.init.d for backwards
-compatability with debstd) exists, then it is installed into
+compatibility with debstd) exists, then it is installed into
 etc/init.d/package in the package build directory, with "package" replaced
 by the packagename. (You may use debian/init for the first binary package
 listed in the control file.)
@@ -33,7 +33,7 @@ Do not restart daemon on upgrade.
 .B \-d, \--remove-d
 Remove trailing "d" from the name of the package, and use the result for the
 filename the init script is installed as in etc/init.d/ . This may be useful
-for daemons with names ending in "d". (Note: this takes precidence over
+for daemons with names ending in "d". (Note: this takes precedence over
 the --init-script parameter described below.)
 .TP
 .B \-uparams, \--update-rcd-params=params
@@ -51,6 +51,7 @@ See
 .BR debhelper (1)
 for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
-.BR debhelper (1)
+.BR debhelper (1),
+.BR update_rc.d (8)
 .SH AUTHOR
 Joey Hess <joeyh@master.debian.org>