Use upstream-supplied doxygen_to_devhelp.xsl (the Automake integration is still a bit broken, so we build it ourselves)

4 files changed, 4 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index 79bf04a4..82a88222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dbus (1.4.8-1) UNRELEASED; urgency=low
 
   * New upstream version
     - 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)
   * Mark dbus, dbus-x11 as Multi-Arch: foreign
   * Remove the unused copy of jquery.js that doxygen now wants to install
   * Correctly credit Michael for his changes in the previous changelog entry
diff --git a/debian/dbus-1-doc.install b/debian/dbus-1-doc.install
index e598fe86..9a772186 100644
--- a/debian/dbus-1-doc.install
+++ b/debian/dbus-1-doc.install
@@ -1,4 +1,5 @@
 doc/dbus-specification.html usr/share/doc/dbus-1-doc
 doc/dbus-test-plan.html usr/share/doc/dbus-1-doc
 doc/dcop-howto.txt usr/share/doc/dbus-1-doc
+doc/dbus.devhelp usr/share/doc/dbus-1-doc/html
 usr/share/doc/dbus-1-doc/html
diff --git a/debian/doxygen_to_devhelp.xsl b/debian/doxygen_to_devhelp.xsl
deleted file mode 100644
index 72098f9f..00000000
--- a/debian/doxygen_to_devhelp.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="1.0">
-
-<xsl:output method="xml" version="1.0" indent="yes"/>
-
-<xsl:param name="prefix"></xsl:param>
-
-<xsl:template match="/">
-  <book title="D-Bus: A system for interprocess communication"
-        name="dbus"
-        link="dbus-tutorial.html">
-  <chapters>
-     <sub name="Tutorial" link="{$prefix}dbus-tutorial.html"/>
-     <sub name="FAQ" link="{$prefix}dbus-faq.html"/>
-     <sub name="Specification" link="{$prefix}dbus-specification.html"/>
-     <sub name="API Reference" link="{$prefix}api/index.html"/>
-  </chapters>
-
-  <functions>
-    <xsl:apply-templates select="doxygenindex/compound[@kind='group']/member[@kind='function']"/>
-  </functions>
-  </book>
-</xsl:template>
-
-<xsl:template match="member">
-  <xsl:param name="name"><xsl:value-of select="name"/></xsl:param>
-  <xsl:param name="refid"><xsl:value-of select="@refid"/></xsl:param>
-  <xsl:param name="before"><xsl:value-of select="substring-before($refid,'_1')"/></xsl:param>
-  <xsl:param name="after"><xsl:value-of select="substring-after($refid,'_1')"/></xsl:param>
-  <xsl:param name="link"><xsl:value-of select="$before"/>.html#<xsl:value-of select="$after"/></xsl:param>
-  <xsl:if test="starts-with($name,'dbus') or starts-with($name, 'DBus')">
-    <xsl:if test="starts-with($refid,'group__') and contains($refid, '_1')">
-       <function name="{$name}" link="{$prefix}api/{$link}"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/debian/rules b/debian/rules
index 2a14939f..4284ed4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build
-	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
+	xsltproc -o doc/dbus.devhelp doc/doxygen_to_devhelp.xsl doc/api/xml/index.xml
 
 override_dh_link:
 	dh_link -plibdbus-1-dev lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so