[Monotone-commits-diffs] org.debian.monotone: eacee73f338122305b01aa65023376065a82981e

[code]

revision:            eacee73f338122305b01aa65023376065a82981e
date:                2012-05-02T07:42:44
author:              address@hidden
branch:              org.debian.monotone
changelog:
Revert the docs change.

manifest:
format_version "1"

new_manifest [5463c5194049d410646bcb9631fa0d236293ccf7]

old_revision [aa01baecdded3a16bad800d63a13d6618cc44974]

patch "changelog"
 from [93e05891c10b741c0d8941ba09a5f5efa0b0cd9f]
   to [4c94f31c8fbe8c08cf9223e6a4a158ae34dae00e]

patch "control"
 from [59aaacf51bf7c5fadb972d333f08fb757d16cee2]
   to [ea61a2924eed1a2e048555373ba7c547df159711]

patch "monotone-doc.doc-base"
 from [244b99aeba3e39b7e867a0f11afede7984928a59]
   to [222bae3d16a75cd2944d65c4f62cec706503dda7]

patch "rules"
 from [2c372d23010d4516ea114046d526ca69a63b1d57]
   to [92ceecd51dd472fd8a83af0c8e9ea25b95dd7ce9]
============================================================
--- changelog	93e05891c10b741c0d8941ba09a5f5efa0b0cd9f
+++ changelog	4c94f31c8fbe8c08cf9223e6a4a158ae34dae00e
@@ -3,8 +3,6 @@ monotone (1.0-6) unstable; urgency=low
   * patches/04-botan-1.10-adaption.diff: Backport upstream fix for
     building and running with Botan-1.10.x.
   * Change debian/control to link against Botan 1.10. Closes: #359050.
-  * Upgrade Standards-Version to 3.9.3, move documentation to the
-    monotone-doc directory. Drop call to dh_installdocs.
   * Adjust Build-Depends debhelper to require version >= 9 as well.
 
  -- Markus Wanner <address@hidden>  Sun, 29 Apr 2012 14:19:41 +0200
============================================================
--- control	59aaacf51bf7c5fadb972d333f08fb757d16cee2
+++ control	ea61a2924eed1a2e048555373ba7c547df159711
@@ -14,7 +14,7 @@ Build-Depends-Indep: poppler-utils | xpd
  bash (>= 4.0), source-highlight, mime-construct
 Build-Depends-Indep: poppler-utils | xpdf-utils, ps2eps,
  texlive-generic-recommended, texlive-latex-base
-Standards-Version: 3.9.3
+Standards-Version: 3.9.2
 
 Package: monotone
 Architecture: any
============================================================
--- monotone-doc.doc-base	244b99aeba3e39b7e867a0f11afede7984928a59
+++ monotone-doc.doc-base	222bae3d16a75cd2944d65c4f62cec706503dda7
@@ -7,14 +7,14 @@ Format: HTML
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/monotone-doc/html/index.html
-Files: /usr/share/doc/monotone-doc/html/*.html 
- /usr/share/doc/monotone-doc/html/*.css
- /usr/share/doc/monotone-doc/html/figures/*.png
- /usr/share/doc/monotone-doc/html/images/*.png
+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
+ /usr/share/doc/monotone/html/images/*.png
 
 Format: PDF
-Files: /usr/share/doc/monotone-doc/monotone.pdf
+Files: /usr/share/doc/monotone/monotone.pdf
 
 Format: Info
 Index: /usr/share/info/monotone.info.gz
============================================================
--- rules	2c372d23010d4516ea114046d526ca69a63b1d57
+++ rules	92ceecd51dd472fd8a83af0c8e9ea25b95dd7ce9
@@ -106,6 +106,10 @@ override_dh_compress:
 override_dh_compress:
 	dh_compress -Xcolorize -X.pdf
 
+# For now, we link /usr/share/doc/monotone-doc to /usr/share/doc/monotone
+override_dh_installdocs:
+	dh_installdocs --link-doc=monotone
+
 # Install init for monotone-server, but with the name monotone
 override_dh_installinit:
 	dh_installinit --name=monotone