r494: * Added .zip and .jar to list of things to compress (Closes: #115735),

     and modified docs (Closes: #115733).

diff --git a/debian/changelog b/debian/changelog
index 69f72eb6706932afb4ab1eb0fc0b6fbc488b8f7d..93e708fe76ef9357b06ac82d7721d7db3f6f9b3c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.0.48) unstable; urgency=low
+
+  * Added .zip and .jar to list of things to compress (Closes: #115735),
+    and modified docs (Closes: #115733).
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 15 Oct 2001 19:01:43 -0400
+
 debhelper (3.0.47) unstable; urgency=low
 
   * dh_installman: documented translated man page support, and made it work

diff --git a/dh_compress b/dh_compress
index 203f60c772d457f9b08a6608d3a6019c16a6f319..e12cc486c142b95c3a0761d938f656ce4cdaf84c 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -23,10 +23,9 @@ to the new files.
 
 By default, dh_compress compresses files that debian policy mandates should
 be compressed, namely all files in usr/share/info, usr/share/man,
-usr/X11R6/man, and all files in usr/share/doc that are larger than 4k in size,
-(except the copyright file, .html files and .gif files), and all changelog
-files. It skips any files that appear to be already compressed (based on their
-extensions).
+usr/X11R6/man, files in usr/share/doc that are larger than 4k in size,
+(except the copyright file, .html files, and files that appear to be already
+compressed based on their extensions), and all changelog files.
 
 If a debian/package.compress file exists, however, it will be ran as a shell
 script, and all filenames that the shell script outputs will be compressed
@@ -97,9 +96,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        find usr/info usr/share/info usr/man usr/share/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true;
                        find usr/doc usr/share/doc -type f \\( -size +4k -or -name "changelog*" \\) \\
                                \\( -name changelog.html -or ! -iname "*.htm*" \\) \\
-                               ! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" ! -iname "*.jpeg" ! -iname "*.gz" \\
-                               ! -iname "*.taz" ! -iname "*.tgz" ! -iname "*.z" ! -iname "*.bz2" \\
-                               ! -iname "*-gz" ! -iname "*-z" ! -iname "*_z" \\
+                               ! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
+                               ! -iname "*.jpeg" ! -iname "*.gz" ! -iname "*.taz" \\
+                               ! -iname "*.tgz" ! -iname "*.z" ! -iname "*.bz2" \\
+                               ! -iname "*-gz"  ! -iname "*-z" ! -iname "*_z" \\
+                               ! -iname "*.jar" ! -iname "*.zip" \\
                                ! -name "copyright" 2>/dev/null || true
                `);
        }