r409: * Corrected globbing issue with dh_movefiles in v3 mode. Closes: #81431

[debhelper.git] / dh_compress

diff --git a/dh_compress b/dh_compress
index a01f5d15265583a6e219e3d7b5d9f03bd92c7a4e..015a1abb9e8d32c74374e22efe99293832e4d0d8 100755 (executable)
--- a/dh_compress
+++ b/dh_compress
@@ -4,8 +4,7 @@
 # compressed files get fixed.
 
 use Cwd;
-BEGIN { push @INC, "debian", "/usr/share/debhelper" }
-use Dh_Lib;
+use Debian::Debhelper::Dh_Lib;
 init();
 
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
@@ -34,13 +33,13 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                # Note that all the excludes of odd things like _z are because
                # gzip refuses to compress such files, assumming they are zip files.
                # I looked at the gzip source to get the complete list of such
-               # extentions: ".gz", ".z", ".taz", ".tgz", "-gz", "-z", "_z"
+               # 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/doc usr/share/doc -type f \\( -size +4k -or -name "changelog*" \\) \\
-                               \\( -name changelog.html -or ! -name "*.htm*" \\) \\
-                               ! -name "*.gif" ! -iname "*.gz" \\
+                               \\( -name changelog.html -or ! -iname "*.htm*" \\) \\
+                               ! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" ! -iname "*.jpeg" ! -iname "*.gz" \\
                                ! -iname "*.taz" ! -iname "*.tgz" ! -iname "*.z" \\
                                ! -iname "*-gz" ! -iname "*-z" ! -iname "*_z" \\
                                ! -name "copyright" 2>/dev/null || true