[xml/sgml-commit] r1364 - in /packages/docbook-xsl/trunk/debian: changelog patches/00list patches/8265_regressions.dpatch

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Fri Feb 20 16:15:50 2009
New Revision: 1364

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1364
Log:
* debian/patches/8265_regressions.dpatch: Added.
  - html/verbatim.xsl, xhtml/verbatim.xsl: Fix a small regression from
    upstream svn revision 8265.
* debian/patches/00list: Adjusted.

Added:
    packages/docbook-xsl/trunk/debian/patches/8265_regressions.dpatch   (with props)
Modified:
    packages/docbook-xsl/trunk/debian/changelog
    packages/docbook-xsl/trunk/debian/patches/00list

Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1364&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Fri Feb 20 16:15:50 2009
@@ -40,6 +40,9 @@
   * debian/patches/514030_debianize_dbtoepub.dpatch: Added.
     - The dbtoepub script needs a few minor changes for a "real" installation
       - not lying around in the stylesheet path.
+  * debian/patches/8265_regressions.dpatch: Added.
+    - html/verbatim.xsl, xhtml/verbatim.xsl: Fix a small regression from
+      upstream svn revision 8265.
   * debian/patches/00list: Adjusted.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 30 Mar 2008 22:08:26 +0200

Modified: packages/docbook-xsl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/00list?rev=1364&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Fri Feb 20 16:15:50 2009
@@ -1,1 +1,2 @@
 514030_debianize_dbtoepub
+8265_regressions

Added: packages/docbook-xsl/trunk/debian/patches/8265_regressions.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/8265_regressions.dpatch?rev=1364&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/8265_regressions.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/8265_regressions.dpatch Fri Feb 20 16:15:50 2009
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 8265_regressions.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream fix from revision 8265 ( abdelazer ):
+## DP:   Another stab at fixing the stupid XSLTHT includes across processors
+## DP:   Saxon regression reported by Sorin Ristache)
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=8265&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/html/verbatim.xsl trunk/html/verbatim.xsl
+--- trunk~/html/verbatim.xsl	2009-02-20 06:00:16.000000000 +0100
++++ trunk/html/verbatim.xsl	2009-02-20 17:09:59.000000000 +0100
+@@ -20,7 +20,11 @@
+ <!-- These stylesheets should be included (in your customization layer
+      or elsewhere) only if you want to use the XSLTHL highlighting tool 
+ <xsl:include href="../highlighting/common.xsl"/>
+-<xsl:include href="highlight.xsl"/>-->
++<xsl:include href="highlight.xsl"/>
++     ... and the next apply-highlighting template should be deleted-->
++<xsl:template name="apply-highlighting">
++    <xsl:apply-templates/>
++</xsl:template>
+ 
+ <lxslt:component prefix="xverb"
+                  functions="numberLines"/>
+diff -urNad trunk~/xhtml/verbatim.xsl trunk/xhtml/verbatim.xsl
+--- trunk~/xhtml/verbatim.xsl	2009-02-20 06:18:36.000000000 +0100
++++ trunk/xhtml/verbatim.xsl	2009-02-20 17:10:03.000000000 +0100
+@@ -16,7 +16,11 @@
+ <!-- These stylesheets should be included (in your customization layer
+      or elsewhere) only if you want to use the XSLTHL highlighting tool 
+ <xsl:include href="../highlighting/common.xsl"/>
+-<xsl:include href="highlight.xsl"/>-->
++<xsl:include href="highlight.xsl"/>
++     ... and the next apply-highlighting template should be deleted-->
++<xsl:template name="apply-highlighting">
++    <xsl:apply-templates/>
++</xsl:template>
+ 
+ <lxslt:component prefix="xverb" functions="numberLines"/>
+ 

Propchange: packages/docbook-xsl/trunk/debian/patches/8265_regressions.dpatch
------------------------------------------------------------------------------
    svn:executable = *