[Pkg-utopia-commits] r1898 - in /packages/unstable/dbus/debian: changelog control dbus-1-doc.install dbus-1-doc.links doxygen_to_devhelp.xsl patches/dbus-1.0.1-generate-xml-docs.patch rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Dec 3 14:43:05 UTC 2007 

Author: lool
Date: Mon Dec  3 14:43:05 2007
New Revision: 1898

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1898
Log:
* Merge patch from Ubuntu to build a devhelp file; thanks Martin Pitt;
  closes: #454142.
  - Build-dep on xsltproc.
  - New patch, dbus-1.0.1-generate-xml-docs, enables generation of XML docs
    which serve as source for the devhelp generation.
  - Add a XSLT file from the Fedora package, debian/doxygen_to_devhelp.xsl.
  - Generate the devhelp file from the XML files thanks to the XSL file via
    xsltproc in build/dbus-1-doc::.
  - Install the devhelp index in dbus-1-doc and move the HTML documentation
    around; add a symlink from the gtk-doc dir.

Added:
    packages/unstable/dbus/debian/dbus-1-doc.links
    packages/unstable/dbus/debian/doxygen_to_devhelp.xsl
    packages/unstable/dbus/debian/patches/dbus-1.0.1-generate-xml-docs.patch
Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/control
    packages/unstable/dbus/debian/dbus-1-doc.install
    packages/unstable/dbus/debian/rules

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1898&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Mon Dec  3 14:43:05 2007
@@ -1,3 +1,18 @@
+dbus (1.1.2-2) UNRELEASED; urgency=low
+
+  * Merge patch from Ubuntu to build a devhelp file; thanks Martin Pitt;
+    closes: #454142.
+    - Build-dep on xsltproc.
+    - New patch, dbus-1.0.1-generate-xml-docs, enables generation of XML docs
+      which serve as source for the devhelp generation.
+    - Add a XSLT file from the Fedora package, debian/doxygen_to_devhelp.xsl.
+    - Generate the devhelp file from the XML files thanks to the XSL file via
+      xsltproc in build/dbus-1-doc::.
+    - Install the devhelp index in dbus-1-doc and move the HTML documentation
+      around; add a symlink from the gtk-doc dir.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 03 Dec 2007 15:42:01 +0100
+
 dbus (1.1.2-1) unstable; urgency=low
 
   [ Michael Biebl ]

Modified: packages/unstable/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/control?rev=1898&op=diff
==============================================================================
--- packages/unstable/dbus/debian/control (original)
+++ packages/unstable/dbus/debian/control Mon Dec  3 14:43:05 2007
@@ -13,6 +13,7 @@
                doxygen,
                docbook-utils,
                xmlto,
+               xsltproc,
                libx11-dev,
                libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.7.2

Modified: packages/unstable/dbus/debian/dbus-1-doc.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus-1-doc.install?rev=1898&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus-1-doc.install (original)
+++ packages/unstable/dbus/debian/dbus-1-doc.install Mon Dec  3 14:43:05 2007
@@ -1,4 +1,7 @@
 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/api/html usr/share/doc/dbus-1-doc/api/
+doc/api/html/* usr/share/doc/dbus-1-doc/html/api
+dbus.devhelp usr/share/doc/dbus-1-doc/html
+doc/dbus-{faq,specification,tutorial}.html usr/share/doc/dbus-1-doc/html
+

Added: packages/unstable/dbus/debian/dbus-1-doc.links
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus-1-doc.links?rev=1898&op=file
==============================================================================
--- packages/unstable/dbus/debian/dbus-1-doc.links (added)
+++ packages/unstable/dbus/debian/dbus-1-doc.links Mon Dec  3 14:43:05 2007
@@ -1,0 +1,1 @@
+usr/share/doc/dbus-1-doc/html usr/share/gtk-doc/html/dbus

Added: packages/unstable/dbus/debian/doxygen_to_devhelp.xsl
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/doxygen_to_devhelp.xsl?rev=1898&op=file
==============================================================================
--- packages/unstable/dbus/debian/doxygen_to_devhelp.xsl (added)
+++ packages/unstable/dbus/debian/doxygen_to_devhelp.xsl Mon Dec  3 14:43:05 2007
@@ -1,0 +1,40 @@
+<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>

Added: packages/unstable/dbus/debian/patches/dbus-1.0.1-generate-xml-docs.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/dbus-1.0.1-generate-xml-docs.patch?rev=1898&op=file
==============================================================================
--- packages/unstable/dbus/debian/patches/dbus-1.0.1-generate-xml-docs.patch (added)
+++ packages/unstable/dbus/debian/patches/dbus-1.0.1-generate-xml-docs.patch Mon Dec  3 14:43:05 2007
@@ -1,0 +1,11 @@
+--- dbus-1.0.1/Doxyfile.in.generate-xml-docs	2006-11-25 23:42:59.000000000 -0500
++++ dbus-1.0.1/Doxyfile.in	2006-11-25 23:43:12.000000000 -0500
+@@ -133,7 +133,7 @@
+ #---------------------------------------------------------------------------
+ # configuration options related to the XML output
+ #---------------------------------------------------------------------------
+-GENERATE_XML           = NO
++GENERATE_XML           = YES
+ #---------------------------------------------------------------------------
+ # Configuration options related to the preprocessor   
+ #---------------------------------------------------------------------------

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=1898&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Mon Dec  3 14:43:05 2007
@@ -24,9 +24,11 @@
 
 build/dbus-1-doc::
 	doxygen Doxyfile
+	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
 
 clean::
 	rm -rf doc/api
 	rm -f test/data/valid-config-files/session.conf
 	rm -f test/data/valid-config-files/system.conf
 	rm -f doc/*.html
+	rm -f dbus.devhelp

More information about the Pkg-utopia-commits mailing list