X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installmanpages;h=cc6a6f6f2c59c8f4330a51f44a6cc8c92cdfe96f;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=415c86b7a21ec63aaa5a24be4cba6f548269f8a2;hpb=4f162e192c3563d740490cc99ced1513104ac34c;p=debhelper.git

diff --git a/dh_installmanpages b/dh_installmanpages
index 415c86b..cc6a6f6 100755
--- 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
 
@@ -12,35 +12,36 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_installmanpages> [S<I<debhelper options>>] [S<I<file ...>>]
+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/
+B<dh_installmanpages> is a debhelper program that is responsible for
+automatically installing man pages into F<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
+B<dh_installmanpages> scans the current directory and all subdirectories for
 filenames that look like man pages. (Note that only real files are looked
 at; symlinks are ignored.) It uses L<file(1)> to verify that the files are
 in the correct format. Then, based on the files' extensions, it installs 
 them into the correct man directory.
 
-All filenames specified as parameters will be skipped by dh_installmanpages.
+All filenames specified as parameters will be skipped by B<dh_installmanpages>.
 This is useful if by default it installs some man pages that you do not
 want to be installed.
 
-After the man page installation step, dh_installmanpages will check to see
-if any of the man pages are ".so" links. If so, it changes them to symlinks.
+After the man page installation step, B<dh_installmanpages> will check to see
+if any of the man pages are F<.so> links. If so, it changes them to symlinks.
 
 =head1 OPTIONS
 
 =over 4
 
-=item I<file ...>
+=item I<file> ...
 
 Do not install these files as man pages, even if they look like valid man
 pages.
@@ -49,18 +50,20 @@ pages.
 
 =head1 BUGS
 
-dh_installmanpages will install the man pages it finds into B<all> packages
+B<dh_installmanpages> will install the man pages it finds into B<all> packages
 you tell it to act on, since it can't tell what package the man
-pages belong in. This is almost never what you really want (use -p to work
+pages belong in. This is almost never what you really want (use B<-p> to work
 around this, or use the much better L<dh_installman(1)> program instead).
 
-Files ending in I<.man> will be ignored.
+Files ending in F<.man> will be ignored.
 
 Files specified as parameters that contain spaces in their filenames will
 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");
 		}