summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xdh_compress2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b1724df5..188eddd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
debhelper (9.20150502) UNRELEASED; urgency=medium
+ * dh_compress: REVERT change to avoid compressing ".xhtml"
+ files due to #784016. (Reopens: #740405, Closes: #784016)
+
-- Niels Thykier <niels@thykier.net> Sat, 02 May 2015 10:08:08 +0200
debhelper (9.20150501) unstable; urgency=medium
diff --git a/dh_compress b/dh_compress
index bbd58478..eb094a48 100755
--- a/dh_compress
+++ b/dh_compress
@@ -113,7 +113,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
find usr/share/doc \\
\\( -type d -name _sources -prune -false \\) -o \\
-type f \\( -size +4k -or -name "changelog*" -or -name "NEWS*" \\) \\
- \\( -name changelog.html -or ! -iname "*.htm*" -or ! -iname "*.xhtml" \\) \\
+ \\( -name changelog.html -or ! -iname "*.htm*" \\) \\
! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
! -iname "*.jpeg" ! -iname "*.gz" ! -iname "*.taz" \\
! -iname "*.tgz" ! -iname "*.z" ! -iname "*.bz2" \\