Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_installmanpages

diff --git a/dh_installmanpages b/dh_installmanpages
index 415c86b7a21ec63aaa5a24be4cba6f548269f8a2..90c453cebb4a7979028ef005196f1cec5de5958d 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_installmanpages - old-style man page installer
+dh_installmanpages - old-style man page installer (deprecated)
 
 =cut
 
@@ -17,11 +17,12 @@ B<dh_installmanpages> [S<I<debhelper options>>] [S<I<file ...>>]
 =head1 DESCRIPTION
 
 dh_installmanpages is a debhelper program that is responsible for
-automatically installing man pages into usr/share/man/ and usr/X11R6/man/
+automatically installing man pages into usr/share/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.
@@ -153,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])/;
                        
@@ -183,7 +182,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        
        # Now the .so conversion.
        @sofiles=@sodests=();
-       foreach my $dir (qw{usr/share/man usr/X11R6/man}) {
+       foreach my $dir (qw{usr/share/man}) {
                if (-e "$tmp/$dir") {
                        find(\&find_so_man, "$tmp/$dir");
                }