r1916: * dh_installman: When --language is used, be smarter about stripping

[debhelper.git] / dh_installman

diff --git a/dh_installman b/dh_installman
index 1d03898e3901af646cfd195b8e48b4e9bccb258b..7f39b9348ef06a221edb33615d00b729b9c10f8b 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -27,7 +27,7 @@ extension of ".3perl"). If your .TH line is incorrect or missing, the program
 may guess wrong based on the file extension.
 
 It also supports translated man pages, by looking for extensions
-like .ll.8 and .ll_LL.8
+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
@@ -36,8 +36,7 @@ dh_installman will follow suit.  See to 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
-into Polish. There is currently no support for resolving this ambiguity;
-programs in debian should probably not have extensions like that anyway.
+into Polish. Use --language=C to avoid this.
 
 Any man page filenames specified as parameters will be installed into the
 first package dh_installman is told to act on. By default, this is the
@@ -60,6 +59,11 @@ is acting on contain ".so" links. If so, it changes them to symlinks.
 Install all files specified by command line parameters in ALL packages
 acted on.
 
+=item B<--language>=ll
+
+Use this to specify that the man pages being acted on are written in the
+specified language.
+
 =item I<manpage ...>
 
 Install these man pages into the first package acted on. (Or in all
@@ -138,15 +142,25 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                my ($instname)=$basename=~m/^(.*)\./;
        
                my $destdir="$tmp/usr/share/man/man$realsection/";
-               # Translated man pages are typically specified by adding the
-               # language code to the filename, so detect that and
-               # redirect to appropriate directory, stripping the code.
-               my ($langcode)=$basename=~m/.*\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
+               my $langcode;
+               if (! defined $dh{LANGUAGE} || ! exists $dh{LANGUAGE}) {
+                       # Translated man pages are typically specified by adding the
+                       # 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)/;
+               }
+               elsif ($dh{LANGUAGE} ne 'C') {
+                       $langcode=$dh{LANGUAGE};
+               }
+               
                if (defined $langcode && $langcode ne '') {
-                       $destdir="$tmp/usr/share/man/$langcode/man$realsection/";
                        # 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
 
                if (! -e "$destdir/$instname.$section" && 
@@ -191,6 +205,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