diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-08 17:58:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-08 17:58:18 -0400 |
| commit | 1c5a972e96705d4157117bf9e854ddf06c340adc (patch) | |
| tree | 4feef06168e0a2b90861ad1913454a0dad93e29a | |
| parent | 7e3a133029e9cbb6fb133c7074ad1bb53a5947e9 (diff) | |
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
| -rw-r--r-- | debhelper.pod | 11 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | dh_installdocs | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/debhelper.pod b/debhelper.pod index a903620c..de390572 100644 --- 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 925185fd..7683e69a 100644 --- 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 14bb27bb..d8ebe62e 100755 --- 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 |