diff options
| author | Niels Thykier <niels@thykier.net> | 2015-05-02 10:10:28 +0200 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2015-05-02 10:21:32 +0200 |
| commit | 951dee203ea9606e209238545d0bba630bc353bc (patch) | |
| tree | f078e372d9e15b0a900df33cfedfcc552e700400 | |
| parent | b9b0320fbf7cf7b01d110a9a15898eed094d7cc6 (diff) | |
| download | debhelper-951dee203ea9606e209238545d0bba630bc353bc.tar.gz | |
Revert "dh_compress: Skip compression of xhtml files"
This reverts commit d5c08b71d7a59dfa5e082672ae2548eee7503fda.
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_compress | 2 |
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" \\ |