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 4e208b4f170cb085e00ca78a297a01ffd93aedbf..8367b27d821c1694af4845c73ba0bd6a0a784ac3 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -23,11 +23,10 @@ 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,
+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/X11R6/lib/X11/fonts/ and
-usr/share/fonts/X11/
+changelog files. Plus PCF fonts underneath usr/share/fonts/X11/
 
 =head1 FILES
 
@@ -35,6 +34,8 @@ usr/share/fonts/X11/
 
 =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
@@ -53,8 +54,7 @@ need to.
 Exclude files that contain "item" anywhere in their filename from being
 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>
 
@@ -92,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 {
@@ -103,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" \\
@@ -114,7 +118,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                                ! -iname "*.svg" ! -iname "*.svgz" \\
                                ! -name "index.sgml" \\
                                ! -name "copyright" 2>/dev/null || true;
-                       find usr/X11R6/lib/X11/fonts usr/share/fonts/X11 -type f -name "*.pcf" 2>/dev/null || true;
+                       find usr/share/fonts/X11 -type f -name "*.pcf" 2>/dev/null || true;
                `);
        }