r336: * Documented that lynx is used to convert html changelogs. Closes: #54055

diff --git a/debian/changelog b/debian/changelog
index dc972ae76f52d16d1f56152cb36a91e7563210b8..173278d5894c49389e3f6d1ff7bd879edad5345b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,8 @@
 debhelper (2.0.87) unstable; urgency=low
 
-  * README: Documented what you should do if you want to make a package that
-    depends on another package, use the other package's doc dir as its own,
-    with a symlink. Closes: #53381
-    
-     ** TODO ** this fix is not good enough, the /usr/doc symlink needs to
-     be handled in the postinst, not appear in the .deb, to comply with
-     policy.
-           
-
- -- Joey Hess <joeyh@debian.org>  Sat, 15 Jan 2000 01:31:40 -0800
+  * Documented that lynx is used to convert html changelogs. Closes: #54055
+
+ -- Joey Hess <joeyh@debian.org>  Mon,  7 Feb 2000 16:01:19 -0800
 
 debhelper (2.0.86) unstable; urgency=low
 

diff --git a/dh_installchangelogs.1 b/dh_installchangelogs.1
index 8009c4adba3c22ee9fa2f54544c61c8931940382..941b7cfed07a12e0aab04568dcbae784354df1c5 100644 (file)
--- a/dh_installchangelogs.1
+++ b/dh_installchangelogs.1
@@ -19,8 +19,9 @@ If an upstream changelog file is specified as an option, and the package is
 not a native debian package, then this upstream changelog will be installed
 as usr/share/doc/package/changelog in the package build directory. If the
 changelog is a html file (determined by file extension), it will be
-installed as usr/share/doc/package/changelog.html instead (with a link to
-usr/share/doc/package/changelog).
+installed as usr/share/doc/package/changelog.html instead, and will be
+converted to plain text with lynx to generate
+usr/share/doc/package/changelog .
 .SH OPTIONS
 .TP
 .B debhelper options

diff --git a/doc/README b/doc/README
index 14df20e88c2a3cab1dd2d43c2db797b85750f209..dcc42e612c0419847ab09f932be60e36b4d607aa 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -56,26 +56,6 @@ EOF
 system ($temp) / 256 == 0
        or die "Problem with debhelper scripts: $!\n";
 
-Building a package that doesn't have a doc directory:
-----------------------------------------------------
-
-Policy says that if a package depends on some other package, and they build
-from the same source, the package can make its doc directory be a symlink to
-the doc directory of the package it depends on. If you want to do this with
-debhelper, do the following (assumes the package is foo-doc, which depends
-on foo):
-
-dh_link usr/share/doc/foo usr/share/doc/foo-doc \
-       usr/share/doc/foo usr/doc/foo-doc
-...
-dh_installdocs -N foo-doc
-dh_installexamples -N foo-doc
-dh_installchangelogs -N foo-doc
-
-So the dh_link actually sets up the symlinks. Then the three debhelper commands
-that normally write into doc directory are told not to act on package
-foo-doc. Voila!
-
 Other notes:
 -----------