Move HTML and text documentation from /u/s/d/dbus-1-doc to /u/s/d/dbus (see Policy bug #107073 for discussion), leaving behind symlinks to their historical locations; this also results in shipping one copy of dbus-specification.html rather than two

4 files changed, 19 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index d73e6498..ed9e3228 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,12 @@ dbus (1.4.8-1) UNRELEASED; urgency=low
     - Use upstream-merged support for installing HTML docs
     - Use upstream-supplied doxygen_to_devhelp.xsl (the Automake integration
       is still a bit broken, so we build it ourselves)
-  * Don't install dbus-specification twice: make one of them a symlink
   * Mark dbus, dbus-x11 as Multi-Arch: foreign
   * Remove the unused copy of jquery.js that doxygen now wants to install
+  * Move HTML and text documentation from /u/s/d/dbus-1-doc to /u/s/d/dbus
+    (see Policy bug #107073 for discussion), leaving behind symlinks to their
+    historical locations; this also results in shipping one copy of
+    dbus-specification.html rather than two
   * Correctly credit Michael for his changes in the previous changelog entry
 
  -- Simon McVittie <smcv@debian.org>  Fri, 18 Feb 2011 10:45:35 +0000
diff --git a/debian/dbus-1-doc.install b/debian/dbus-1-doc.install
index 9933d927..29604fda 100644
--- a/debian/dbus-1-doc.install
+++ b/debian/dbus-1-doc.install
@@ -1,7 +1,7 @@
-doc/dcop-howto.txt usr/share/doc/dbus-1-doc
-doc/dbus-faq.html usr/share/doc/dbus-1-doc/html
-doc/dbus-specification.html usr/share/doc/dbus-1-doc/html
-doc/dbus-test-plan.html usr/share/doc/dbus-1-doc
-doc/dbus-tutorial.html usr/share/doc/dbus-1-doc/html
-doc/dbus.devhelp usr/share/doc/dbus-1-doc/html
-usr/share/doc/dbus-1-doc/html
+doc/dcop-howto.txt usr/share/doc/dbus
+doc/dbus-faq.html usr/share/doc/dbus
+doc/dbus-specification.html usr/share/doc/dbus
+doc/dbus-test-plan.html usr/share/doc/dbus
+doc/dbus-tutorial.html usr/share/doc/dbus
+doc/dbus.devhelp usr/share/doc/dbus
+usr/share/doc/dbus
diff --git a/debian/dbus-1-doc.links b/debian/dbus-1-doc.links
index 24722c18..0431bb29 100644
--- a/debian/dbus-1-doc.links
+++ b/debian/dbus-1-doc.links
@@ -1,2 +1,7 @@
-usr/share/doc/dbus-1-doc/html/dbus-specification.html usr/share/doc/dbus-1-doc/dbus-specification.html
-usr/share/doc/dbus-1-doc/html usr/share/gtk-doc/html/dbus
+usr/share/doc/dbus/dbus-faq.html usr/share/doc/dbus-1-doc/html/dbus-faq.html
+usr/share/doc/dbus/dbus-specification.html usr/share/doc/dbus-1-doc/dbus-specification.html
+usr/share/doc/dbus/dbus-specification.html usr/share/doc/dbus-1-doc/html/dbus-specification.html
+usr/share/doc/dbus/dbus-test-plan.html usr/share/doc/dbus-1-doc/dbus-test-plan.html
+usr/share/doc/dbus/dbus-tutorial.html usr/share/doc/dbus-1-doc/html/dbus-tutorial.html
+usr/share/doc/dbus/dcop-howto.txt.gz usr/share/doc/dbus-1-doc/dcop-howto.txt.gz
+usr/share/doc/dbus usr/share/gtk-doc/html/dbus
diff --git a/debian/rules b/debian/rules
index 4284ed4a..bbad4e2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_configure:
 		--enable-doxygen-docs \
 		--disable-libaudit \
 		--libexecdir=\$${prefix}/lib/dbus-1.0 \
-		--htmldir=\$${prefix}/share/doc/dbus-1-doc/html \
+		--htmldir=\$${prefix}/share/doc/dbus \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
 override_dh_auto_build: