#
#
# delete "debian/monotone-server.examples"
# 
# add_file "debian/monotone-doc.doc-base"
#  content [8cca0bd4a32e4e65142af055fbd38f299eed8e84]
# 
# patch "debian/changelog"
#  from [2679ba3563d26623e72ee5a61a47d048ff3c4826]
#    to [8df684e2d19b17b984d67b3657d756dae8f14159]
# 
# patch "debian/control"
#  from [62318b78abab9543f3cbc183c190230e499bb5f9]
#    to [73ee7b2329440674ddd9cf8100c08676e91a3ed2]
# 
# patch "debian/monotone-doc.dirs"
#  from [87882a2689244f9c7380a9c320c595e52c0f3b02]
#    to [f6173411af16a69abba3fe7572866591c6121b23]
# 
# patch "debian/monotone-doc.docs"
#  from [234795010ef0166d4bba978034cc12b2f2459373]
#    to [befa0a5aa8814a3a456423e6fa384348e9660721]
# 
# patch "debian/monotone-server.dirs"
#  from [03976bb511b4f98e04b46ba38be3cd756a4cfd00]
#    to [f375fd99eb1d2d4d378db7e40a9cf0fe97ee11b6]
# 
# patch "debian/rules"
#  from [0bd97c7aaece3021a5522460346ad25a8abc8bb4]
#    to [e1965c0a78f16a52051743e46214243cd0f235ca]
#
============================================================
--- debian/monotone-doc.doc-base	8cca0bd4a32e4e65142af055fbd38f299eed8e84
+++ debian/monotone-doc.doc-base	8cca0bd4a32e4e65142af055fbd38f299eed8e84
@@ -0,0 +1,20 @@
+Document: monotone-manual
+Title: Monotone version control system manual
+Author: Graydon Hoare et al
+Abstract: This manual documents the Monotone distributed version control
+  system.  It includes a basic tutorial, several use examples, and
+  a detailed reference.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/monotone/html/index.html
+Files: /usr/share/doc/monotone/html/*.html 
+  /usr/share/doc/monotone/html/*.css
+  /usr/share/doc/monotone/html/figures/*.png
+
+Format: PDF
+Files: /usr/share/doc/monotone/monotone.pdf
+
+Format: Info
+Index: /usr/share/info/monotone.info.gz
+Files: /usr/share/info/monotone.info*.gz
============================================================
--- debian/changelog	2679ba3563d26623e72ee5a61a47d048ff3c4826
+++ debian/changelog	8df684e2d19b17b984d67b3657d756dae8f14159
@@ -1,3 +1,16 @@
+monotone (0.40-2) unstable; urgency=low
+
+  * Install HTML documentation in /usr/share/doc/monotone/html, not
+    /usr/share/doc/html.  (Closes: #480072)
+  * Make /usr/share/doc/monotone-server and /usr/share/doc/monotone-doc
+    symlinks to /usr/share/doc/monotone; do not ship any files in those
+    packages that are also in the main monotone package.  This requires
+    adding a dependency of monotone-doc on monotone.
+  * Register monotone manual with doc-base.
+  * Improve description of monotone-doc package.
+
+ -- Zack Weinberg <address@hidden>  Sat, 24 May 2008 09:30:07 -0400
+
 monotone (0.40-1) unstable; urgency=low
 
   [ Zack Weinberg ]
============================================================
--- debian/control	62318b78abab9543f3cbc183c190230e499bb5f9
+++ debian/control	73ee7b2329440674ddd9cf8100c08676e91a3ed2
@@ -39,6 +39,14 @@ Architecture: all
 Package: monotone-doc
 Section: doc
 Architecture: all
+Depends: monotone (>= ${source:Version})
 Description: A distributed version (revision) control system - documentation
+ Monotone is a free, distributed version control system. It provides
+ fully disconnected operation, manages complete tree versions, keeps
+ its state in a local transactional database, supports overlapping
+ branches and extensible metadata, uses an efficient peer-to-peer
+ network protocol, performs history-sensitive merging, and delegates
+ trust functions to client-side RSA certificates.
+ .
  This package contains the documentation for monotone in Info, HTML, and PDF
+ formats.
- formats. See the description of the package monotone for more details.
============================================================
--- debian/monotone-doc.dirs	87882a2689244f9c7380a9c320c595e52c0f3b02
+++ debian/monotone-doc.dirs	f6173411af16a69abba3fe7572866591c6121b23
@@ -1 +1 @@
-usr/share/doc/html/figures
+usr/share/doc/monotone/html/figures
============================================================
--- debian/monotone-doc.docs	234795010ef0166d4bba978034cc12b2f2459373
+++ debian/monotone-doc.docs	befa0a5aa8814a3a456423e6fa384348e9660721
@@ -1,6 +1 @@
-AUTHORS
-NEWS
-README
-README.changesets
-UPGRADE
 monotone.pdf
============================================================
--- debian/monotone-server.dirs	03976bb511b4f98e04b46ba38be3cd756a4cfd00
+++ debian/monotone-server.dirs	f375fd99eb1d2d4d378db7e40a9cf0fe97ee11b6
@@ -1,5 +1,6 @@ var/run/monotone
 var/lib/monotone
 var/lib/monotone/keys
 etc/monotone
 var/log/monotone
 var/run/monotone
+usr/share/doc
============================================================
--- debian/rules	0bd97c7aaece3021a5522460346ad25a8abc8bb4
+++ debian/rules	e1965c0a78f16a52051743e46214243cd0f235ca
@@ -107,24 +107,43 @@ clean:
 	dh_clean
 
 # Build architecture-independent files here.
-binary-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -i
+#
+# Both monotone-server and monotone-doc are permitted to have their
+# documentation directories be symlinks to the main package's
+# documentation directory, per Policy 12.5.  This means we should not
+# run dh_installexamples or dh_installchangelogs for either, and should
+# not run dh_installdocs for monotone-server.  monotone-doc needs us
+# to run dh_installdocs for monotone.pdf and doc-base support, but then
+# needs a bunch of -X flags to avoid conflicting files.
+#
 # The upstream makefiles' install targets do nothing useful for these
 # packages.  (In particular, we do not want the monolithic
 # monotone.html installed.)  Annoyingly, at present we cannot simply
 # dh_installdocs the entire html directory, because it contains a
 # bunch of unwanted junk; instead we dh_installdirs the directory
-# hierarchy that is required and use cp -p to put all the files in place.
-	cp -p html/*.html html/*.css debian/monotone-doc/usr/share/doc/html
-	cp -p html/figures/*.png debian/monotone-doc/usr/share/doc/html/figures
+# hierarchy that is required and use cp -p to put all the files in
+# place.  (Using globs in monotone-doc.docs would get everything dumped
+# directly into /usr/share/doc/monotone, which doesn't work.)
 
-	dh_installchangelogs -i
+binary-indep: build-indep
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	dh_installdirs -i
+	cd debian/monotone-doc/usr/share/doc && \
+	    ln -s monotone monotone-doc
+	cd debian/monotone-server/usr/share/doc && \
+	    ln -s monotone monotone-server
+
+	cp -p html/*.html html/*.css \
+	    debian/monotone-doc/usr/share/doc/monotone/html
+	cp -p html/figures/*.png \
+	    debian/monotone-doc/usr/share/doc/monotone/html/figures
+	dh_installdocs -p monotone-doc -X copyright -X NEWS
+
 	dh_installdebconf -i
-	dh_installdocs -i
-	dh_installexamples -i
+
 # we should have logrotate support for monotone-server, but currently we don't
 #	dh_installlogrotate -i --name=monotone
 	dh_installinit -i --name=monotone