[debhelper-devel] [debhelper] 01/02: 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 d5c08b71d7a59dfa5e082672ae2548eee7503fda
Author: Osamu Aoki <osamu at debian.org>
Date:   Thu Jan 1 20:32:18 2015 +0100

    dh_compress: Skip compression of xhtml files
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_compress      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5077825..3fa6ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ debhelper (9.20150101.1) UNRELEASED; urgency=medium
   * Dh_lib: Add a public "make_symlink" subroutine allowing
     dh_*-like tools to generate policy compliant symlinks without
     invoking dh_link.  (Closes: #610173)
+  * dh_compress: Apply patch from Osamu Aoki to avoid compressing
+    ".xhtml" files.  (Closes: #740405)
 
  -- Niels Thykier <niels at thykier.net>  Thu, 01 Jan 2015 17:24:38 +0100
 
diff --git a/dh_compress b/dh_compress
index e908dd8..3255132 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*" \\) \\
+				\\( -name changelog.html -or ! -iname "*.htm*" -or ! -iname "*.xhtml" \\) \\
 				! -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