dh_installdocs: Add --link-doc option that can be used to link documentation director...

diff --git a/debhelper.pod b/debhelper.pod
index a903620ce94311adb4528d375a41cba0490928b3..de390572c2b6e27457a7f7edae3a8a0e0921b914 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -471,17 +471,6 @@ none is specified.
 
 =back
 
-=head2 Doc directory symlinks
-
-Sometimes it is useful to make a package not contain a /usr/share/doc/package
-directory at all, instead placing just a dangling symlink in the binary
-package, that points to some other doc directory. Policy says this is ok if
-your package depends on the package whose doc directory it uses. To
-accomplish this, just don't tell debhelper to install any documentation
-files into the package, and use dh_link to set up the symlink (or do it by
-hand), and debhelper should do the right thing: notice it is a dangling
-symlink and not try to install a copyright file or changelog.
-
 =head2 udebs
 
 Debhelper includes support for udebs. To create a udeb with debhelper,

diff --git a/debian/changelog b/debian/changelog
index 925185fd7229459862256af544daa632b7d506ae..7683e69a2498ebf224c4843721266c7f9ec2c6d2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ debhelper (7.4.2) UNRELEASED; urgency=low
   * Man page typo. Closes: #545443
   * dh: Remove duplicate dh_installcatalogs list. Closes: #545483
     (It was only run once due to logging.)
+  * dh_installdocs: Add --link-doc option that can be used to link
+    documentation directories. This is easier to use and more flexible
+    than the old method of running dh_link first to make a broken symlink.
+    Closes: #545676 Thanks, Colin Watson
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Sep 2009 12:48:39 -0400
 

diff --git a/dh_installdocs b/dh_installdocs
index 14bb27bbc2f3a379b1cc32282fc0ad2b1bcba991..d8ebe62e7c8ce984aac007fc30ad26e1197e22ba 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -85,6 +85,10 @@ option will have no effect on packages with linked documentation
 directories, and copyright, changelog, README.Debian, and TODO files will
 not be installed.
 
+(An older method to accomplish the same thing, which is still supported,
+is to make the documentation directory of a package be a dangling symlink,
+before calling dh_installdocs.)
+
 =item I<file ...>
 
 Install these files as documentation into the first package acted on. (Or