dh_installman: man --recode transparently uncompresses compressed pages. So when...

diff --git a/debian/changelog b/debian/changelog
index 90b3fdc1397a68eddfa10546f40f06e1b52ef33b..40dc133e01d61bc73e344d0d548f2de1377a1831 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (6.0.11) unstable; urgency=medium
+
+  * dh_installman: man --recode transparently uncompresses compressed
+    pages. So when saving the output back, save it to a non-compressed
+    filename (and delete the original, compressed file). Closes: #470913
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Apr 2008 18:31:12 -0400
+
 debhelper (6.0.10) unstable; urgency=low
 
   * dh_perl: Remove empty directories created by MakeMaker.

diff --git a/dh_installman b/dh_installman
index dbe25dd235b2688de5a61f7116ef016063a440f3..f0ff2245af48968f7872093d3ca74109416da544 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -197,9 +197,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (-e "$tmp/$dir") {
                        find(sub {
                                return if ! -f $_ || -l $_;
-                               complex_doit "man --recode UTF-8 ./\Q$_\E > \Q$_.new\E";
-                               doit "chmod",644,"$_.new";
-                               doit "mv","-f","$_.new",$_;
+                               my ($tmp, $orig)=($_.".new", $_);
+                               complex_doit "man --recode UTF-8 ./\Q$orig\E > \Q$tmp\E";
+                               # recode uncompresses compressed pages
+                               doit "rm", "-f", $orig if s/\.(gz|Z)$//;
+                               doit "chmod", 644, $tmp;
+                               doit "mv", "-f", $tmp, $_;
                        }, "$tmp/$dir");
                }
        }

diff --git a/t/size b/t/size
index f661db642137f6325bad8a3e8c39b5af08351ad3..fb915544f6e2e5a3579bc18db8f1856a472e4047 100755 (executable)
--- a/t/size
+++ b/t/size
@@ -25,6 +25,6 @@ foreach my $file (@progs) {
        }
        close IN;
        print "# $file has $lines lines, max length is $maxlength\n";
-       ok($lines < 150, $file);
+       ok($lines < 200, $file);
        ok($maxlength < 160, $file);
 }