X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_compress;h=9db01e40b053fec84eb12d232eca62cd09d5219d;hb=c77e9d08ced12f8180a3f1c173570cbfe569c2da;hp=d9758f0f9cc9163ecee4548987a2f667bb1a9b1e;hpb=e76cc55d1c450b8880c30ff4ff1448bfaeb293f5;p=debhelper.git

diff --git a/dh_compress b/dh_compress
index d9758f0..9db01e4 100755
--- a/dh_compress
+++ b/dh_compress
@@ -23,17 +23,25 @@ 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/ and usr/share/fonts/X11/
-
-If a debian/package.compress file exists, the default files are not
-compressed. Instead, the debian/packages.compress 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.
+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
+
+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,7 +50,7 @@ debian/package.compress file if you really need 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 files 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.
@@ -94,7 +102,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 +113,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 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;
 		`);
 	}
 
@@ -150,7 +163,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