From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 1 Apr 2008 22:31:15 +0000 (-0400)
Subject: dh_installman: man --recode transparently uncompresses compressed pages. So when... 
X-Git-Tag: 6.0.11^0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b2fcc49059c2133a2f989a6fc163d3c11c188fd1;p=debhelper.git

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
---

diff --git a/debian/changelog b/debian/changelog
index 90b3fdc..40dc133 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 dbe25dd..f0ff224 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");
 		}
 	}
diff --git a/t/size b/t/size
index f661db6..fb91554 100755
--- 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);
 }