Excuse me.  I should have tested :-(

> > Thanks, I suspect I found the guilty commit - I will just be confirming
> > my suspicion.
> 
> Got it!  Reverting d5c08b71d7a59dfa5e082672ae2548eee7503fda[1] fixes the
> problem.  Expect an upload to unstable shortly.
> 
> Osamu: Lets look into a revised version of your patch for the next
> release. :)

Here is the patch (but not tested one yet) before I loose it.

Also, I noticed some inconsistent use of -o and -or in this segment of
code.  I attach another patch to unify these to use the POSIX syntax -o.

Osamu
>From 774f36eb92288f2dab89bd2d2feb1b1fad1619a0 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 10 May 2015 09:10:16 +0900
Subject: [PATCH 1/2] dh_compress: skip xhtml compression

Try again with correct fix
---
 dh_compress | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dh_compress b/dh_compress
index eb094a4..0716fdd 100755
--- a/dh_compress
+++ b/dh_compress
@@ -114,6 +114,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				\\( -type d -name _sources -prune -false \\) -o \\
 				-type f \\( -size +4k -or -name "changelog*" -or -name "NEWS*" \\) \\
 				\\( -name changelog.html -or ! -iname "*.htm*" \\) \\
+				! -iname "*.xhtml" \\
 				! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
 				! -iname "*.jpeg" ! -iname "*.gz" ! -iname "*.taz" \\
 				! -iname "*.tgz" ! -iname "*.z" ! -iname "*.bz2" \\
-- 
2.1.4

>From 1d94aa53274a78243d2dae9c5dd285cd1116d589 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <os...@debian.org>
Date: Sun, 10 May 2015 09:18:21 +0900
Subject: [PATCH 2/2] Use POSIX compliant find syntax

expr1 -or expr2
       Same as expr1 -o expr2, but not POSIX compliant.
---
 dh_compress | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dh_compress b/dh_compress
index 0716fdd..ee51322 100755
--- a/dh_compress
+++ b/dh_compress
@@ -112,8 +112,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				2>/dev/null || true;
 			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*" \\) \\
+				-type f \\( -size +4k -o -name "changelog*" -o -name "NEWS*" \\) \\
+				\\( -name changelog.html -o ! -iname "*.htm*" \\) \\
 				! -iname "*.xhtml" \\
 				! -iname "*.gif" ! -iname "*.png" ! -iname "*.jpg" \\
 				! -iname "*.jpeg" ! -iname "*.gz" ! -iname "*.taz" \\
-- 
2.1.4

Reply via email to