[xml/sgml-commit] r2083 - in /packages/docbook-slides/trunk/debian: changelog patches/series patches/titlenpefix.patch

[malat at users.alioth.debian.org]

Author: malat
Date: Tue Oct  2 15:50:24 2012
New Revision: 2083

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2083
Log:
Fix #686516

Added:
    packages/docbook-slides/trunk/debian/patches/titlenpefix.patch
Modified:
    packages/docbook-slides/trunk/debian/changelog
    packages/docbook-slides/trunk/debian/patches/series

Modified: packages/docbook-slides/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-slides/trunk/debian/changelog?rev=2083&op=diff
==============================================================================
--- packages/docbook-slides/trunk/debian/changelog (original)
+++ packages/docbook-slides/trunk/debian/changelog Tue Oct  2 15:50:24 2012
@@ -1,3 +1,10 @@
+docbook-slides (3.4.0-5) unstable; urgency=low
+
+  * Prevent java NPE when using link within title. Closes: #686516
+    + debian/patches/titlenpefix.patch
+
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 02 Oct 2012 17:49:04 +0200
+
 docbook-slides (3.4.0-4) unstable; urgency=low
 
   * Fix an issue with broken PDF meta data output.

Modified: packages/docbook-slides/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-slides/trunk/debian/patches/series?rev=2083&op=diff
==============================================================================
--- packages/docbook-slides/trunk/debian/patches/series (original)
+++ packages/docbook-slides/trunk/debian/patches/series Tue Oct  2 15:50:24 2012
@@ -1,3 +1,4 @@
 brokenurl.patch
 fixdbhtml.patch
 fixsubtitle.patch
+titlenpefix.patch

Added: packages/docbook-slides/trunk/debian/patches/titlenpefix.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-slides/trunk/debian/patches/titlenpefix.patch?rev=2083&op=file
==============================================================================
--- packages/docbook-slides/trunk/debian/patches/titlenpefix.patch (added)
+++ packages/docbook-slides/trunk/debian/patches/titlenpefix.patch Tue Oct  2 15:50:24 2012
@@ -1,0 +1,27 @@
+Description: FOP throws NPE if a foot-note is declared within a static-region
+Author: Mathieu Malaterre <malat at debian.org>
+Origin: vendor, https://lists.oasis-open.org/archives/docbook-apps/201209/msg00062.html
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=53817
+Bug-Debian: http://bugs.debian.org/686516
+Forwarded: not-needed
+
+--- docbook-slides-3.4.0.orig/xsl/fo/plain.xsl
++++ docbook-slides-3.4.0/xsl/fo/plain.xsl
+@@ -226,7 +226,7 @@
+               font-weight="bold"
+               text-align="center"
+               font-family="{$slide.title.font.family}">
+-      <xsl:apply-templates select="title" mode="titlepage.mode"/>
++      <xsl:apply-templates select="title" mode="title.markup"/>
+     </fo:block>
+   </fo:static-content>
+ 
+@@ -237,7 +237,7 @@
+               font-weight="bold"
+               text-align="center"
+               font-family="{$slide.title.font.family}">
+-      <xsl:apply-templates select="title" mode="titlepage.mode"/>
++      <xsl:apply-templates select="title" mode="title.markup"/>
+       <xsl:text> </xsl:text>
+       <xsl:call-template name="gentext">
+         <xsl:with-param name="key" select="'Continued'"/>