Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_installman

diff --git a/dh_installman b/dh_installman
index 6544eae46b68b79401e53babc57fecfb17724028..f0ff2245af48968f7872093d3ca74109416da544 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -32,7 +32,7 @@ like .ll.8 and .ll_LL.8, or by use of the --language switch.
 If dh_installman seems to install a man page into the wrong section or with
 the wrong extension, this is because the man page has the wrong section
 listed in its .TH line. Edit the man page and correct the section, and
-dh_installman will follow suit.  See to L<man(7)> for details about the .TH
+dh_installman will follow suit.  See L<man(7)> for details about the .TH
 section. If dh_installman seems to install a man page into a directory
 like /usr/share/man/pl/man1/, that is because your program has a
 name like "foo.pl", and dh_installman assumes that means it is translated
@@ -50,6 +50,11 @@ After the man page installation step, dh_installman will check to see if
 any of the man pages in the temporary directories of any of the packages it
 is acting on contain ".so" links. If so, it changes them to symlinks.
 
+Also, dh_installman will use man to guess the character encoding of each
+manual page and convert it to UTF-8. If the guesswork fails for some
+reason, you can override it using an encoding declaration. See
+L<manconv(1)> for details.
+
 =head1 OPTIONS
 
 =over 4
@@ -92,9 +97,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $file=pkgfile($package,"manpages");
        my @manpages;
 
-       if ($file) {
-               @manpages=filearray($file, ".");
-       }
+       @manpages=filearray($file, ".") if $file;
 
        if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
                push @manpages, @ARGV;
@@ -132,8 +135,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
                # Now get the numeric component of the section.
                my ($realsection)=$section=~m/^(\d)/ if defined $section;
-               
-               # If there is no numeric section, bail.
                if (! $realsection) {
                        error("Could not determine section for $page");
                }
@@ -148,30 +149,34 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        # language code to the filename, so detect that and
                        # redirect to appropriate directory, stripping the code.
                        ($langcode)=$basename=~m/.*\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
-                       if (defined $langcode && $langcode ne '') {
-                               # Strip the language code from the instname.
-                               $instname=~s/\.$langcode$//;
-                       }
                }
                elsif ($dh{LANGUAGE} ne 'C') {
                        $langcode=$dh{LANGUAGE};
-                       ($instname)=$basename=~m/(.*?)\./;
+               }
+               
+               if (defined $langcode && $langcode ne '') {
+                       # Strip the language code from the instname.
+                       $instname=~s/\.$langcode$//;
                }
                
                if (defined $langcode && $langcode ne '') {
                        $destdir="$tmp/usr/share/man/$langcode/man$realsection/";
                }
                $destdir=~tr:/:/:s; # just for looks
+               my $instpage="$destdir/$instname.$section";
 
-               if (! -e "$destdir/$instname.$section" && 
-                   ! -l "$destdir/$instname.$section") {
-                       if (! -d $destdir) {
-                               doit "install","-d",$destdir;
-                       }
-                       doit "install","-p","-m644",$page,
-                               "$destdir$instname.$section$gz";
+               next if -l $instpage;
+               next if compat(5) && -e $instpage;
+
+               if (! -d $destdir) {
+                       doit "install","-d",$destdir;
+               }
+               if ($gz) {
+                       complex_doit "zcat \Q$page\E > \Q$instpage\E";
+               }
+               else {
+                       doit "install","-p","-m644",$page,$instpage;
                }
-               
        }
 
        # Now the .so conversion.
@@ -186,6 +191,21 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit "rm","-f",$sofile;
                doit "ln","-sf",$sodest,$sofile;
        }
+
+       # Now utf-8 conversion.
+       foreach my $dir (qw{usr/share/man usr/X11R6/man}) {
+               if (-e "$tmp/$dir") {
+                       find(sub {
+                               return if ! -f $_ || -l $_;
+                               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");
+               }
+       }
 }
 
 # Check if a file is a .so man page, for use by File::Find.
@@ -205,6 +225,11 @@ sub find_so_man {
        }
        my $l=<SOTEST>;
        close SOTEST;
+
+       if (! defined $l) {
+               error("failed to read $_");
+       }
+       
        if ($l=~m/\.so\s+(.*)\s*/) {
                my $solink=$1;
                # This test is here to prevent links like ... man8/../man8/foo.8