r432: more podization, will it ever end?

18 files changed, 481 insertions, 430 deletions

diff --git a/dh_installlogrotate b/dh_installlogrotate
index 8cefc454..7ccae6a1 100755
--- a/dh_installlogrotate
+++ b/dh_installlogrotate
@@ -1,9 +1,26 @@
 #!/usr/bin/perl -w
-#
-# Install logrotate config files.
+
+=head1 NAME
+
+dh_installlogrotate - install logrotate config files
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_logrotate [debhelper options]
+
+=head1 DESCRIPTION
+
+dh_installlogrotate is a debhelper program that is responsible for installing
+logrotate config files into etc/logrotate.d in package build directories.
+Files named debian/package.logrotate are installed.
+
+=cut
+
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -17,3 +34,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("install","-m",644,$file,"$tmp/etc/logrotate.d/$package");
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installlogrotate.1 b/dh_installlogrotate.1
deleted file mode 100644
index 2cea36e0..00000000
--- a/dh_installlogrotate.1
+++ /dev/null
@@ -1,26 +0,0 @@
-.TH DH_INSTALLLOGROTATE 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installlogrotate \- install logrotate config files
-.SH SYNOPSIS
-.B dh_logrotate
-.I "[debhelper options]"
-.SH "DESCRIPTION"
-dh_installlogrotate is a debhelper program that is responsible for installing
-logrotate config files into etc/logrotate.d in package build directories.
-Files named debian/package.logrotate are installed.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH "SEE ALSO"
-.BR debhelper (1)
-.SH "CONFORMS TO"
-Debian policy, version 3.0.1
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installman b/dh_installman
index 03e5e9f7..15c20e5e 100755
--- a/dh_installman
+++ b/dh_installman
@@ -1,11 +1,64 @@
 #!/usr/bin/perl -w
-#
-# Reads debian/manpages, installs all man pages there into appropriate
-# man page directory tree.
+
+=head1 NAME
+
+dh_installman - install man pages into package build directories
+
+=cut
 
 use strict;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installman [debhelper options] [manpage ...]
+
+=head1 DESCRIPTION
+
+dh_installman is a debhelper program that is responsible for installing
+man pages into the correct locations in package build directories. You tell
+it what man pages go in your package(s), and it figures out where to
+install them based on the section field in their .TH line and their filename
+extention.
+
+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
+first binary package in debian/control, but if you use -p, -i, or -a flags,
+it will be the first package specified by those flags.
+
+Files named debian/package.manpages can list other man pages to be
+installed.
+
+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.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-A>, B<--all>
+
+Install all files specified by command line parameters in ALL packages
+acted on.
+
+=item I<manpage ...>
+
+Install these man pages into the first package acted on. (Or in all
+packages if -A is specified).
+
+=back
+
+=head1 NOTES
+
+An older version of this program, L<dh_installmanpages(1)>, is still used
+by some packages, and so is still included in debhelper.
+It is, however, deprecated, due to its counterintuiitive and inconsistent
+interface. Use this program instead.
+
+=cut
+
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -127,3 +180,15 @@ sub find_so_man {
 		push @sodests,$solink;
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installman.1 b/dh_installman.1
deleted file mode 100644
index bb7e592b..00000000
--- a/dh_installman.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.TH DH_INSTALLMAN 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installman \- install man pages into package build directories
-.SH SYNOPSIS
-.B dh_installman
-.I "[debhelper options] [manpage ...]"
-.SH "DESCRIPTION"
-dh_installman is a debhelper program that is responsible for installing
-man pages into the correct locations in package build directories. You tell
-it what man pages go in your package(s), and it figures out where to install
-them based on the section field in their .TH line and their filename
-extention.
-.P
-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
-first binary package in debian/control, but if you use -p, -i, or -a flags,
-it will be the first package specified by those flags.
-.P
-Files named debian/package.manpages can list other man pages to be installed.
-.P
-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.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B \-A, \--all
-Install all files specified by command line parameters in ALL packages
-acted on.
-.TP
-.B manpage ...
-Install these man pages into the first package acted on. (Or in all packages
-if -A is specified).
-.SH NOTES
-An older version of this program,
-.BR dh_installmanpages (1)
-, is still used by some packages, and so is still included in debhelper.
-It is, however, deprecated, due to its counterintuiitive and inconsistent
-interface. Use this program instead.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH "SEE ALSO"
-.BR debhelper (1)
-.SH BUGS
-It's impossible to specify filenames with spaces or other whitespace in
-them in debian/package.manpages file. This is more a historical design
-flaw than a bug.
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installmanpages b/dh_installmanpages
index 5d4b3e30..60dcd832 100755
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -1,14 +1,66 @@
 #!/usr/bin/perl -w
-#
-# Automatically find and install man pages. However, do not install any man 
-# pages listed on the command line.
-# Also change man pages with .so commands in them into symlinks.
-#
-# This is a little bit (hah!) DWIMish, but still very handy.
+
+=head1 NAME
+
+dh_installmanpages - old-style man page installer
+
+=cut
 
 use strict;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installmanpages [debhelper options] [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/
+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.
+
+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.
+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.
+
+=head1 OPTIONS
+
+=over 4
+
+=item I<file ...>
+
+Do not install these files as man pages, even if they look like valid man
+pages.
+
+=back
+
+=head1 BUGS
+
+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
+around this, or use the much better L<dh_installman(1)> program instead).
+
+Files ending in I<.man> will be ignored.
+
+Files specified as parameters that contain spaces in their filenames will
+not be processed properly.
+
+=cut
+
 init();
 
 # Check if a file is a man page, for use by File::Find.
@@ -140,3 +192,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit "ln","-sf",$sodest,$sofile;
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installmanpages.1 b/dh_installmanpages.1
deleted file mode 100644
index a95f463c..00000000
--- a/dh_installmanpages.1
+++ /dev/null
@@ -1,65 +0,0 @@
-.TH DH_INSTALLMANPAGES 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installmanpages \- old-style man page installer
-.SH SYNOPSIS
-.B dh_installmanpages
-.I "[debhelper options] [file ...]"
-.SH "DESCRIPTION"
-dh_installmanpages is a debhelper program that is responsible for
-automatically installing man pages into usr/share/man/ and usr/X11R6/man/ in
-package build directories.
-.P
-This is a DWIM-style program, with an interface unlike the rest of
-debhelper. You are encouraged to use
-.BR dh_installman (1)
-instead.
-.P
-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
-.BR 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.
-.P
-All filenames specified as parameters will be skipped by dh_installmanpages.
-This is useful if by default it installs some man pages that you do not want
-to be installed.
-.P
-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.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B file ...
-Do not install these files as man pages, even if they look like valid man
-pages.
-.SH NOTES
-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.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH "SEE ALSO"
-.BR debhelper (1)
-.BR dh_installman (1)
-.SH BUGS
-Man pages with the extension
-.B .man
-are not automatically installed.
-.P
-Files specified as parameters that contain spaces in their filenames will
-not be processed properly.
-.P
-By default, all man pages are installed into all binary packages, which is
-almost never what you really want (use -p to work around this).
-.P
-This is a "Do what I Mean" type program - you have been warned!
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installmenu b/dh_installmenu
index 2f732090..bfddb16c 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -1,15 +1,47 @@
 #!/usr/bin/perl -w
-#
-# Integration with debian menu system:
-#
-# If debian/menu file exists, save it to $tmp/usr/lib/menu/$package
-# If debian/menu-method file exists, save it to 
-# $tmp/etc/menu-methods/$package
-#
-# Also, add to postinst and postrm.
+
+=head1 NAME
+
+dh_installmenu - install debian menu files into package build directories
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installmenu [debhelper options] [-n]
+
+=head1 DESCRIPTION
+
+dh_installmenu is a debhelper program that is responsible for installing
+files used by the debian menu package into package build directories.
+
+It also automatically generates the postinst and postrm commands needed to
+interface with the debian menu package. See L<dh_installdeb(1)> for an
+explanation of how this works.
+
+If a file named debian/package.menu exists, then it is installed into
+usr/lib/menu/package in the package build directory. This is a debian menu
+file.
+
+If a file named debian/package.menu-method exits, then it is installed into
+etc/menu-methods/package in the package build directory. This is a debian
+menu method file.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-n>, B<--noscripts>
+
+Do not modify postinst/postrm scripts.
+
+=back
+
+=cut
+
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -43,3 +75,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installmenu.1 b/dh_installmenu.1
deleted file mode 100644
index a1e10e83..00000000
--- a/dh_installmenu.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH DH_INSTALLMENU 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installmenu \- install debian menu files into package build directories
-.SH SYNOPSIS
-.B dh_installmenu
-.I "[debhelper options] [-n]"
-.SH "DESCRIPTION"
-dh_installmenu is a debhelper program that is responsible for installing
-files used by the debian menu package into package build directories.
-.P
-It also automatically generates the postinst and postrm commands needed to
-interface with the debian menu package. See
-.BR dh_installdeb (1)
-for an explanation of how this works.
-.P
-If a file named debian/package.menu exists, then it is installed into
-usr/lib/menu/package in the package build directory. This is a debian menu
-file.
-.P
-If a file named debian/package.menu-method exits, then it is installed into
-etc/menu-methods/package in the package build directory. This is a debian
-menu method file.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B \-n, \--noscripts
-Do not modify postinst/postrm scripts.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH NOTES
-Note that this command is not idempotent. "dh_clean -k" should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-.SH "SEE ALSO"
-.TP
-.BR debhelper (1)
-.TP
-.BR menufile (5)
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installmime b/dh_installmime
index 59d8c873..9eeab7ba 100755
--- a/dh_installmime
+++ b/dh_installmime
@@ -1,9 +1,48 @@
 #!/usr/bin/perl -w
-#
-# Mime support.
+
+=head1 NAME
+
+dh_installmime - install mime files into package build directories
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installmime [debhelper options] [-n]
+
+=head1 DESCRIPTION
+
+dh_installmime is a debhelper program that is responsible for installing
+mime files into package build directories.
+
+It also automatically generates the postinst and postrm commands needed to
+interface with the debian mime-support package. See L<dh_installdeb(1)> for
+an explanation of how this works.
+
+If a file named debian/package.mime exists, then it is installed into
+usr/lib/mime/packages/package in the package build directory.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-n>, B<--noscripts>
+
+Do not modify postinst/postrm scripts.
+
+=back
+
+=head1 NOTES
+
+Note that this command is not idempotent. "dh_clean -k" should be called
+between invocations of this command. Otherwise, it may cause multiple
+instances of the same text to be added to maintainer scripts.
+
+=cut
+
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -22,3 +61,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installmime.1 b/dh_installmime.1
deleted file mode 100644
index 2a825922..00000000
--- a/dh_installmime.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.TH DH_INSTALLMIME 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installmime \- install mime files into package build directories
-.SH SYNOPSIS
-.B dh_installmime
-.I "[debhelper options] [-n]"
-.SH "DESCRIPTION"
-dh_installmime is a debhelper program that is responsible for installing
-mime files into package build directories.
-.P
-It also automatically generates the postinst and postrm commands needed to
-interface with the debian mime-support package. See
-.BR dh_installdeb (1)
-for an explanation of how this works.
-.P
-If a file named debian/package.mime exists, then it is installed into
-usr/lib/mime/packages/package in the package build directory.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B \-n, \--noscripts
-Do not modify postinst/postrm scripts.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH NOTES
-Note that this command is not idempotent. "dh_clean -k" should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-.SH "SEE ALSO"
-.TP
-.BR debhelper (1)
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installmodules b/dh_installmodules
index e31d1d02..f17780a3 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -1,10 +1,52 @@
 #!/usr/bin/perl -w
-#
-# Register modules with modutils.
+
+=head1 NAME
+
+dh_installmodules - register modules with modutils
+
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
 use File::Find;
+
+=head1 SYNOPSIS
+
+  dh_installmodules [debhelper options] [-n]
+
+=head1 DESCRIPTION
+
+dh_installmodules is a debhelper program that is responsible for
+registering kernel modules with modutils.
+
+Files named debian/package.modules will be installed as
+etc/modutils/package in the package build directory.
+
+Then postinst and postrm commands are automatically generated to register
+the modules when the package is installed. See L<dh_installdeb(1)> for an
+explanation of how this works. Note that this will be done for any
+package this program acts on which has either the above-mentioned file, or
+has .o files in /lib/modules.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-n>, B<--noscripts>
+
+Do not modify postinst/postrm scripts.
+
+=back
+
+=head1 NOTES
+
+Note that this command is not idempotent. "dh_clean -k" should be called
+between invocations of this command. Otherwise, it may cause multiple
+instances of the same text to be added to maintainer scripts.
+
+=cut
+
 init();
 
 # Returns true if there are any .o files in the passed directory.
@@ -38,3 +80,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			autoscript($package,"postrm","postrm-modules","s/#PACKAGE#/$package/");
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installmodules.1 b/dh_installmodules.1
deleted file mode 100644
index 0f7627b8..00000000
--- a/dh_installmodules.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.TH DH_INSTALLMODULES 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installmodules \- register modules with modutils
-.SH SYNOPSIS
-.B dh_installmodules
-.I "[debhelper options] [-n]"
-.SH "DESCRIPTION"
-dh_installmodules is a debhelper program that is responsible for registering
-kernel modules with modutils.
-.P
-Files named debian/package.modules will be installed as etc/modutils/package
-in the package build directory.
-.P
-Then postinst and postrm commands are automatically generated to register
-the modules when the package is installed. See
-.BR dh_installdeb (1)
-for an explanation of how this works. Note that this will be done for any
-package this program acts on which has either the above-mentioned file, or
-has .o files in /lib/modules.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B \-n, \--noscripts
-Do not modify postinst/postrm scripts.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH NOTES
-Note that this command is not idempotent. "dh_clean -k" should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-.SH "SEE ALSO"
-.BR debhelper (1)
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installpam b/dh_installpam
index 85ee0927..527f7ced 100755
--- a/dh_installpam
+++ b/dh_installpam
@@ -1,11 +1,28 @@
 #!/usr/bin/perl -w
-#
-# Integration with debian pam system:
-#
-# If debian/pam file exists, save it to $tmp/etc/pam.d/$package
+
+=head1 NAME
+
+dh_installpam - install pam support files
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installpam [debhelper options] [-n]
+
+=head1 DESCRIPTION
+
+dh_installpam is a debhelper program that is responsible for installing
+files used by PAM into package build directories.
+
+If a file named debian/package.pam exists, then it is installed into
+etc/pam.d/package in the package build directory.
+
+=cut
+
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -19,3 +36,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("install","-p","-m644",$pam,"$tmp/etc/pam.d/$package");
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installpam.1 b/dh_installpam.1
deleted file mode 100644
index 31d0a933..00000000
--- a/dh_installpam.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH DH_INSTALLPAM 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installpam \- install pam support files
-.SH SYNOPSIS
-.B dh_installpam
-.I "[debhelper options] [-n]"
-.SH "DESCRIPTION"
-dh_installpam is a debhelper program that is responsible for installing
-files used by PAM into package build directories.
-.P
-If a file named debian/package.pam exists, then it is installed into
-etc/pam.d/package in the package build directory.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH NOTES
-Note that this command is not idempotent. "dh_clean -k" should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-.SH "SEE ALSO"
-.TP
-.BR debhelper (1)
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installwm b/dh_installwm
index 8bbee699..842b4f4c 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -1,9 +1,61 @@
 #!/usr/bin/perl -w
-#
-# Add to postinst and prerm to register a window manager.
+
+=head1 NAME
+
+dh_installwm - register a window manager
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installwm [debhelper options] [-n] [--priority=n] [wm ...]
+
+=head1 DESCRIPTION
+
+dh_installwm is a debhelper program that is responsible for
+generating the postinst and postrm commands that register a window manager
+with L<update-alternatives(8)>
+
+Any window manager programs specified as parameters will be registered in
+the first package dh_installwm is told to act on. By default, this is the
+first binary package in debian/control, but if you use -p, -i, or -a flags,
+it will be the first package specified by those flags.
+
+Files named debian/package.wm can list other window manager programs to
+register.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<--priority=>I<n>
+
+Set the priority of the window manager. Default is 20, which is too low for
+most window managers; see the Debian Policy document for instructions on
+calculating the correct value.
+
+=item B<-n>, B<--noscripts>
+
+Do not modify postinst/postrm scripts. Turns this command into a no-op.
+
+=item I<wm ...>
+
+The commands used to run the window manager or window managers you want to
+register.
+
+=head1 NOTES
+
+Note that this command is not idempotent. "dh_clean -k" should be called
+between invocations of this command. Otherwise, it may cause multiple
+instances of the same text to be added to maintainer scripts.
+
+=back
+
+=cut
+
 init();
 
 if (! defined $dh{PRIORITY}) {
@@ -39,3 +91,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 }
 
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installwm.1 b/dh_installwm.1
deleted file mode 100644
index 88d29c81..00000000
--- a/dh_installwm.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH DH_INSTALLWM 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installwm \- register a window manager
-.SH SYNOPSIS
-.B dh_installwm
-.I "[debhelper options] [-n] [--priority=n] [wm ...]"
-.SH "DESCRIPTION"
-dh_installwm is a debhelper program that is responsible for
-generating the postinst and postrm commands that register a window manager
-with
-.BR update-alternatives (8)
-.P
-Any windowmanager filenames specified as parameters will be registered in
-the first package dh_installwm is told to act on. By default, this is the
-first binary package in debian/control, but if you use -p, -i, or -a flags, it
-will be the first package specified by those flags.
-.P
-Files named debian/package.wm can list other window managers programs to
-register.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B \--priority=n
-Set the priority of the window manager. Default is 20, which is too low for
-most window managers; see the Debian Policy document for instructions on
-calculating the correct value.
-.TP
-.B \-n, \--noscripts
-Do not modify postinst/postrm scripts. Turns this command into a no-op.
-.TP
-.B wmfilename
-The filename of the window manager you wish to register.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH NOTES
-Note that this command is not idempotent. "dh_clean -k" should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-.SH "SEE ALSO"
-.TP
-.BR debhelper (1)
-.TP
-.BR update-alternatives (8)
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>
diff --git a/dh_installxaw b/dh_installxaw
index e5ecf93d..3bda1fa0 100755
--- a/dh_installxaw
+++ b/dh_installxaw
@@ -1,14 +1,48 @@
 #!/usr/bin/perl -w
-#
-# Integration with xaw-wrappers
-#
-# If debian/xaw-wrappers file exists, save it to 
-# $tmp/usr/share/xaw-wrappers/config/$package
-#
-# Also, add calls to postinst and postrm.
+
+=head1 NAME
+
+dh_installxaw - install xaw wrappers config files into package build directories
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+  dh_installxaw [debhelper options] [-n]
+
+=head1 DESCRIPTION
+
+dh_installxaw is a debhelper program that is responsible for installing
+xaw wrappers config files into package build directories.
+
+It also automatically generates the postinst, prerm, and postrm commands
+needed to interface with the debian xaw-wrappers package. See
+L<dh_installdeb(1)> for an explanation of how this works.
+
+If a file named debian/package.xaw exists, then it is installed into
+usr/lib/xaw-wrappers/config/package in the package build directory.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-n>, B<--noscripts>
+
+Do not modify postinst/prerm/postrm scripts.
+
+=back
+
+=head1 NOTES
+
+Note that this command is not idempotent. "dh_clean -k" should be called
+between invocations of this command. Otherwise, it may cause multiple
+instances of the same text to be added to maintainer scripts.
+
+=cut
+
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -63,3 +97,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 }
+
+=head1 SEE ALSO
+
+L<debhelper(1)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut
diff --git a/dh_installxaw.1 b/dh_installxaw.1
deleted file mode 100644
index 809f0cd8..00000000
--- a/dh_installxaw.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH DH_INSTALLXAW 1 "" "Debhelper Commands" "Debhelper Commands"
-.SH NAME
-dh_installxaw \- install xaw wrappers config files into package build directories
-.SH SYNOPSIS
-.B dh_installxaw
-.I "[debhelper options] [-n]"
-.SH "DESCRIPTION"
-dh_installxaw is a debhelper program that is responsible for installing
-xaw wrappers config files into package build directories.
-.P
-It also automatically generates the postinst, prerm, and postrm commands needed to 
-interface with the debian xaw-wrappers package. See
-.BR dh_installdeb (1)
-for an explanation of how this works.
-.P
-If a file named debian/package.xaw exists, then it is installed into
-usr/lib/xaw-wrappers/config/package in the package build directory.
-.SH OPTIONS
-.TP
-.B debhelper options
-See
-.BR debhelper (1)
-for a list of options common to all debhelper commands.
-.TP
-.B \-n, \--noscripts
-Do not modify postinst/prerm/postrm scripts.
-.SH ENVIRONMENT
-See
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
-.SH NOTES
-Note that this command is not idempotent. "dh_clean -k" should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-.SH "SEE ALSO"
-.TP
-.BR debhelper (1)
-.TP
-.BR update-xaw-wrappers (8)
-.SH AUTHOR
-Joey Hess <joeyh@debian.org>