diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | dh_installman | 9 | ||||
| -rwxr-xr-x | t/size | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 90b3fdc1..40dc133e 100644 --- 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 dbe25dd2..f0ff2245 100755 --- 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"); } } @@ -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); } |