debian/compress files are now deprecated. Seems only one package (genesis) still...

[debhelper.git] / dh_compress

diff --git a/dh_compress b/dh_compress
index cbdf627c55e72205efd1d75f328e5ccc7bb3b3f6..8367b27d821c1694af4845c73ba0bd6a0a784ac3 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -23,17 +23,27 @@ 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, files in usr/share/doc that are larger than 4k in size,
-(except the copyright file, .html and .css files, and files that appear to be
-already compressed based on their extensions), and all changelog files. Plus
-PCF fonts underneath usr/X11R6/lib/X11/fonts/
-
-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
-instead of the default files. The shell script will be run from
-inside the package build directory. Note though that using -X is a much
-better idea in general; you should only use a debian/package.compress file
-if you really have to.
+files in usr/share/doc that are larger than 4k in size,
+(except the copyright file, .html and .css files, image files, and files
+that appear to be already compressed based on their extensions), and all
+changelog files. Plus PCF fonts underneath usr/share/fonts/X11/
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.compress
+
+These files are deprecated.
+
+If this file exists, the default files are not compressed. Instead, the
+file is ran as a shell script, and all filenames that the shell script
+outputs will be compressed. The shell script will be run from inside the
+package build directory. Note though that using -X is a much better idea in
+general; you should only use a debian/package.compress file if you really
+need to.
+
+=back
 
 =head1 OPTIONS
 
@@ -42,10 +52,9 @@ if you really have to.
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude files that contain "item" anywhere in their filename from being
-compressed. For example, -X.jpeg will exclude jpeg's from compression.
+compressed. For example, -X.tiff will exclude tiff files from compression.
 You may use this option multiple times to build up a list of things to
-exclude. You can accomplish the same thing by using a debian/compress file,
-but this is easier.
+exclude.
 
 =item B<-A>, B<--all>
 
@@ -83,8 +92,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                push @files, @ARGV;
        }
        if ($compress) {
-               # The config file is a sh script that outputs the files to be compressed
+               # The compress file is a sh script that outputs the files to be compressed
                # (typically using find).
+               warning("$compress is deprecated; use -X or avoid calling dh_compress instead");
                push @files, split(/\n/,`sh $olddir/$compress 2>/dev/null`);
        }
        else {
@@ -94,7 +104,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # complete list of such extensions: ".gz", ".z", ".taz", 
                # ".tgz", "-gz", "-z", "_z"
                push @files, split(/\n/,`
-                       find usr/info usr/share/info usr/man usr/share/man usr/X11*/man -type f ! -name "*.gz" 2>/dev/null || true;
+                       find usr/info usr/share/info usr/man usr/share/man usr/X11*/man -type f ! -iname "*.gz" \\
+                               ! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
+                               ! -iname "*.jpeg" \\
+                               2>/dev/null || true;
                        find usr/share/doc -type f \\( -size +4k -or -name "changelog*" -or -name "NEWS*" \\) \\
                                \\( -name changelog.html -or ! -iname "*.htm*" \\) \\
                                ! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
@@ -102,8 +115,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                ! -iname "*.tgz" ! -iname "*.z" ! -iname "*.bz2" \\
                                ! -iname "*-gz"  ! -iname "*-z" ! -iname "*_z" \\
                                ! -iname "*.jar" ! -iname "*.zip" ! -iname "*.css" \\
+                               ! -iname "*.svg" ! -iname "*.svgz" \\
+                               ! -name "index.sgml" \\
                                ! -name "copyright" 2>/dev/null || true;
-                       find usr/X11R6/lib/X11/fonts -type f -name "*.pcf" 2>/dev/null || true;
+                       find usr/share/fonts/X11 -type f -name "*.pcf" 2>/dev/null || true;
                `);
        }
 
@@ -150,7 +165,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # Make executables not be anymore.
                xargs(\@f,"chmod","a-x");
                
-               xargs(\@f,"gzip","-9f");
+               xargs(\@f,"gzip","-9nf");
        }
        
        # Now change over any files we can that used to be hard links so