r535: updates

3 files changed, 20 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index b7d86363..8a29fb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (4.0.16) unstable; urgency=low
+
+UNRE
+  * Pound home in dh_installman's man page that yet, it really does do the
+    right thing. Closes: #150644
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 21 Jun 2002 16:21:06 -0400
+
 debhelper (4.0.15) unstable; urgency=low
 
   * Stupid, evil typo.
diff --git a/dh_installman b/dh_installman
index cc94843e..402f4a94 100755
--- a/dh_installman
+++ b/dh_installman
@@ -19,15 +19,21 @@ B<dh_installman> [S<I<debhelper options>>] [S<I<manpage ...>>]
 dh_installman is a debhelper program that handles installing
 man pages into the correct locations in package build directories. You tell
 it what man pages go in your packages, and it figures out where to
-install them based on the section field in their .TH line and their filename
-extension. It also supports translated man pages, by looking for extensions
+install them based on the section field in their .TH line. If you have a
+properly formatted .TH line, your man page will be installed into the right
+directory, with the right name (this includes proper handling of pages
+with a subsection, like "3perl", which are placed in man3, and given an
+extention of ".3perl"). If your .TH line is incorrect or missing, the program
+may guess wrong based on the file extention.
+
+It also supports translated man pages, by looking for extensions
 like .ll.8 and .ll_LL.8
 
 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
 listed in its .TH line. Edit the man page and correct the section, and
 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
+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;
diff --git a/doc/TODO b/doc/TODO
index e5ee0b7a..71534ea2 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -43,6 +43,9 @@ Wishlist items:
 * Add a switch to dh_installdeb to allow it to do user defined
   substitutions. OTOH, maybe it's better if people just sed
   postinst.in before debhelper gets its hands on it... (#25235)
+* install-info, as of dpkg 1.10, parses the info file for section if
+  --section is not given. So I should be able to stop parsing it myself for
+  section, after dpkg 1.10 has been around long enough.
 
 Deprecated: