[xml/sgml-commit] r1439 - in /packages/docbook-xsl/trunk/debian: changelog patches/00list patches/528132_fix_epub_container.dpatch

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

Author: dleidert-guest
Date: Mon May 11 11:19:01 2009
New Revision: 1439

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1439
Log:
* debian/patches/528132_fix_epub_container.dpatch: Added.
  - epub/docbook.xsl: Remove odfc namespace prefix to fix container.xml
    (closes: #528132).
* debian/patches/00list: Adjusted.

Added:
    packages/docbook-xsl/trunk/debian/patches/528132_fix_epub_container.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=1439&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon May 11 11:19:01 2009
@@ -1,6 +1,10 @@
 docbook-xsl (1.75.0+dfsg-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * debian/patches/528132_fix_epub_container.dpatch: Added.
+    - epub/docbook.xsl: Remove odfc namespace prefix to fix container.xml
+      (closes: #528132).
+  * debian/patches/00list: Adjusted.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 10 May 2009 14:02:45 +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=1439&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Mon May 11 11:19:01 2009
@@ -1,2 +1,3 @@
 514030_debianize_dbtoepub
 528004_apply_simpara_content
+528132_fix_epub_container

Added: packages/docbook-xsl/trunk/debian/patches/528132_fix_epub_container.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/528132_fix_epub_container.dpatch?rev=1439&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/528132_fix_epub_container.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/528132_fix_epub_container.dpatch Mon May 11 11:19:01 2009
@@ -1,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 528132_fix_epub_container.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: epub/docbook.xsl: Remove namespace prefix in container.xml. This will
+## DP:   "fix" viewing/processing the epubs (closes: #528132).
+## DP:
+## DP: <URL:http://bugs.debian.org/528132>
+
+ at DPATCH@
+diff -urNad trunk~/epub/docbook.xsl trunk/epub/docbook.xsl
+--- trunk~/epub/docbook.xsl	2009-05-07 02:34:35.000000000 +0200
++++ trunk/epub/docbook.xsl	2009-05-11 13:16:23.000000000 +0200
+@@ -6,14 +6,13 @@
+   xmlns:h="http://www.w3.org/1999/xhtml"
+   xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/"
+   xmlns:ng="http://docbook.org/docbook-ng"
+-  xmlns:odfc="urn:oasis:names:tc:opendocument:xmlns:container"
+   xmlns:opf="http://www.idpf.org/2007/opf"
+   xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns:xtext="xalan://com.nwalsh.xalan.Text"
+ 
+   extension-element-prefixes="stext xtext"
+-  exclude-result-prefixes="exsl db dc h ncx ng opf odfc stext xtext"
++  exclude-result-prefixes="exsl db dc h ncx ng opf stext xtext"
+ 
+   version="1.0">
+ 
+@@ -359,20 +358,12 @@
+       <xsl:with-param name="doctype-system" select="''"/> <!-- intentionally blank -->
+ 
+       <xsl:with-param name="content">
+-        <xsl:element name="odfc:container">
+-          <xsl:attribute name="version">1.0</xsl:attribute>
+-          <xsl:element name="odfc:rootfiles">
+-            <xsl:element name="odfc:rootfile">
+-              <xsl:attribute name="full-path">
+-                <!-- TODO: Figure out how to get this to work right with generation but also not be hardcoded -->
+-                <xsl:value-of select="'OEBPS/content.opf'"/>
+-              </xsl:attribute>
+-              <xsl:attribute name="media-type">
+-                <xsl:text>application/oebps-package+xml</xsl:text>
+-              </xsl:attribute>
+-            </xsl:element>
+-          </xsl:element>
+-        </xsl:element>
++        <container xmlns="urn:oasis:names:tc:opendocument:xmlns:container" version="1.0">
++	  <rootfiles>
++            <!-- TODO: Figure out how to get this to work right with generation but also not be hardcoded -->
++            <rootfile full-path="OEBPS/content.opf" media-type="application/oebps-package+xml"/>
++          </rootfiles>
++        </container>
+       </xsl:with-param>
+     </xsl:call-template>
+   </xsl:template>

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