[debhelper-devel] [debhelper] 02/03: Revert "dh_compress: Skip compression of xhtml files"

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 951dee203ea9606e209238545d0bba630bc353bc
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 2 10:10:28 2015 +0200

    Revert "dh_compress: Skip compression of xhtml files"
    
    This reverts commit d5c08b71d7a59dfa5e082672ae2548eee7503fda.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog | 3 +++
 dh_compress      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b1724df..188eddd 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 at 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 bbd5847..eb094a4 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" \\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git