summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_compress5
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 552e284f..1a879f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.4.13) UNRELEASED; urgency=low
+
+ * dh_compress: Avoid compressing images in /usr/share/info. Closes: #567586
+
+ -- Joey Hess <joeyh@debian.org> Sun, 31 Jan 2010 14:34:30 -0500
+
debhelper (7.4.12) unstable; urgency=low
* dh_bugfiles: Doc typo. Closes: #563269
diff --git a/dh_compress b/dh_compress
index efeca8ac..9db01e40 100755
--- a/dh_compress
+++ b/dh_compress
@@ -102,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" \\