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

[debhelper.git] / dh_installmanpages

diff --git a/dh_installmanpages b/dh_installmanpages
index cbde23c301ffe9fac973b71bc926a9204bb296a5..2257517b0df0efb151cdb92ee85d2b93a8a8b1d6 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -12,7 +12,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_installmanpages [debhelper options] [file ...]
+B<dh_installmanpages> [S<I<debhelper options>>] [S<I<file ...>>]
 
 =head1 DESCRIPTION
 
@@ -21,7 +21,8 @@ automatically installing man pages into usr/share/man/ and usr/X11R6/man/
 in package build directories.
 
 This is a DWIM-style program, with an interface unlike the rest of
-debhelper. You are encouraged to use L<dh_installman(1)> instead.
+debhelper. It is deprecated, and you are encouraged to use
+L<dh_installman(1)> instead.
 
 dh_installmanpages scans the current directory and all subdirectories for
 filenames that look like man pages. (Note that only real files are looked
@@ -61,6 +62,8 @@ not be processed properly.
 
 =cut
 
+warning("This program is deprecated, switch to dh_installman.");
+
 init();
 
 # Check if a file is a man page, for use by File::Find.
@@ -112,9 +115,9 @@ sub find_so_man {
        if ($l=~m/\.so\s+(.*)/) {
                my $solink=$1;
                # This test is here to prevent links like ... man8/../man8/foo.8
-               if (Debian::Debhelper::Dh_Lib::basename($File::Find::dir) eq
-                   Debian::Debhelper::Dh_Lib::dirname($solink)) {
-                       $solink=Debian::Debhelper::Dh_Lib::basename($solink);
+               if (basename($File::Find::dir) eq
+                   dirname($solink)) {
+                       $solink=basename($solink);
                }
                else {
                        $solink="../$solink";
@@ -126,11 +129,13 @@ sub find_so_man {
 }
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
+       next if is_udeb($package);
+
        my $tmp=tmpdir($package);
 
        # Find all filenames that look like man pages.
        @manpages=();
-       @allpackages=GetPackages('');
+       @allpackages=getpackages('');
        find(\&find_man,'.'); # populates @manpages
        
        foreach my $page (@manpages) {
@@ -151,10 +156,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                
                if ($install) {
                        my $extdir="share";
-                       # Handle X man pages specially.
-                       if ($basename=~/x$/) {
-                               $extdir="X11R6";
-                       }
                        
                        my ($section)=$basename=~m/.*\.([1-9])/;
                        
@@ -195,7 +196,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.