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

diff --git a/debian/changelog b/debian/changelog
index fd0beb530d2733d3deb0e27769daab1867f43f63..c851773ce70f102ab44479bf928e6323077755db 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debhelper (7.4.21) UNRELEASED; urgency=low
     not itself normally look will be passed to it, a behavior change which
     may break some packages. Closes: #557603
   * dh_testversion: Removed this deprecated command.
+  * debian/compress files are now deprecated. Seems only one package
+    (genesis) still uses them.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 May 2010 20:01:19 -0400
 

diff --git a/dh_compress b/dh_compress
index 9db01e40b053fec84eb12d232eca62cd09d5219d..8367b27d821c1694af4845c73ba0bd6a0a784ac3 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -34,6 +34,8 @@ changelog files. Plus PCF fonts underneath 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
@@ -52,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>
 
@@ -91,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 {

diff --git a/doc/TODO b/doc/TODO
index 2af719724141a531dc0fd067cbfc77af9aa64148..8f6fde378815a4c2ad0296ef4fb4759ae53861ca 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -34,10 +34,8 @@ Deprecated:
   a string are not used in debhelper itself, but have been left in the
   library in case other things use them. Deprecate and remove.
 * dh --before , --after , --until , --remaining
+* debian/compress files
 
 Also, grep the entire archive for all dh_* command lines,
 and check to see what other switches are not being used, and maybe remove
 some of them. 
-
-I'd also like to deprecate/remove debian/compress files, -X is
-a better idea.