[xml/sgml-commit] r1884 - in /packages/docbook-xsl/trunk/debian: ./ patches/ source/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Mon May 16 17:48:14 UTC 2011
Author: dleidert-guest
Date: Mon May 16 17:48:13 2011
New Revision: 1884
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1884
Log:
* debian/control (Build-Depends): Dropped dpatch in favour of source format
3.0 (quilt).
(Standards-Version): Bumped to 3.9.2.
(Description): Mention XSL-FO (closes: #604004, #623977).
(Recommends): Downgrade docbook-xsl-doc* packages to Suggests (closes:
#610726, #623976).
* debian/rules: Dropped dpatch and useless get-orig-source target.
(override_dh_auto_test): Run the check-xml target.
* debian/get-orig-source.sh: Create one source package for docbook-xsl and
docbook-xsl-ns.
* debian/source/format: Changed to 3.0 (quilt).
* debian/patches/605696_fix_section_name_for_lexgrog.patch: Added.
- */common/es.xml: Fix Spanish translation for RefName to make it being
recognized by lexgrog (closes: #605696).
* debian/patches/611924_html_same_ids_for_quote.patch: Added.
- */*html/inline.xsl (quote): Don't call the anchor
template to not duplicate IDs (closes: #611924).
* debian/patches/620556_fo_segmentedlist_with_segtitles.patch: Added.
- */fo/lists.xsl (segmentedlist): Create the number of columns needed in
table mode (closes: #620556).
* debian/patches/00list: Renamed to debian/patches/series and adjusted.
* debian/patches/00options,
debian/patches/00template: Dropped.
Added:
packages/docbook-xsl/trunk/debian/patches/605696_fix_section_name_for_lexgrog.patch
packages/docbook-xsl/trunk/debian/patches/611924_html_same_ids_for_quote.patch
packages/docbook-xsl/trunk/debian/patches/620556_fo_segmentedlist_with_segtitles.patch
packages/docbook-xsl/trunk/debian/patches/series
packages/docbook-xsl/trunk/debian/source/
packages/docbook-xsl/trunk/debian/source/format
Removed:
packages/docbook-xsl/trunk/debian/patches/00list
packages/docbook-xsl/trunk/debian/patches/00options
packages/docbook-xsl/trunk/debian/patches/00template
Modified:
packages/docbook-xsl/trunk/debian/changelog
packages/docbook-xsl/trunk/debian/control
packages/docbook-xsl/trunk/debian/get-orig-source.sh
packages/docbook-xsl/trunk/debian/rules
Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon May 16 17:48:13 2011
@@ -2,10 +2,32 @@
* NOT RELEASED YET
* New upstream release.
+ - Fixed bug when context was lost (closes: #602537).
* debian/control (Vcs-Browser, Vcs-Svn): Adjusted for unstable.
- * debian/rules (override_dh_auto_test): Run the check-xml target.
+ (Build-Depends): Dropped dpatch in favour of source format 3.0 (quilt).
+ (Standards-Version): Bumped to 3.9.2.
+ (Description): Mention XSL-FO (closes: #604004, #623977).
+ (Recommends): Downgrade docbook-xsl-doc* packages to Suggests (closes:
+ #610726, #623976).
+ * debian/rules: Dropped dpatch and useless get-orig-source target.
+ (override_dh_auto_test): Run the check-xml target.
(check-xml): Added the --nonet switch to avoid internet access.
(.PHONY): Added the check-xml target.
+ * debian/get-orig-source.sh: Create one source package for docbook-xsl and
+ docbook-xsl-ns.
+ * debian/source/format: Changed to 3.0 (quilt).
+ * debian/patches/605696_fix_section_name_for_lexgrog.patch: Added.
+ - */common/es.xml: Fix Spanish translation for RefName to make it being
+ recognized by lexgrog (closes: #605696).
+ * debian/patches/611924_html_same_ids_for_quote.patch: Added.
+ - */*html/inline.xsl (quote): Don't call the anchor
+ template to not duplicate IDs (closes: #611924).
+ * debian/patches/620556_fo_segmentedlist_with_segtitles.patch: Added.
+ - */fo/lists.xsl (segmentedlist): Create the number of columns needed in
+ table mode (closes: #620556).
+ * debian/patches/00list: Renamed to debian/patches/series and adjusted.
+ * debian/patches/00options,
+ debian/patches/00template: Dropped.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 31 Aug 2010 22:57:24 +0200
Modified: packages/docbook-xsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/control?rev=1884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/control (original)
+++ packages/docbook-xsl/trunk/debian/control Mon May 16 17:48:13 2011
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 7.0.50~), dpatch, libxml2-utils, docbook-xml (>> 4.4)
+Build-Depends: debhelper (>> 7.0.50~), libxml2-utils, docbook-xml (>> 4.4)
Build-Depends-Indep: xml-core
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheets
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl/branches/trunk/
@@ -14,17 +14,18 @@
Package: docbook-xsl
Architecture: all
Depends: ${misc:Depends}
-Recommends: docbook-xml (>= 4.1.2-4), docbook-xsl-doc-html | docbook-xsl-doc-pdf | docbook-xsl-doc-text | docbook-xsl-doc
-Suggests: libsaxon-java, libxalan2-java, docbook-xsl-saxon, fop, xalan, dbtoepub, libxslthl-java
+Recommends: docbook-xml (>= 4.1.2-4)
+Suggests: docbook-xsl-doc-html | docbook-xsl-doc-pdf | docbook-xsl-doc-text | docbook-xsl-doc,
+ libsaxon-java, libxalan2-java, docbook-xsl-saxon, fop, xalan, dbtoepub, libxslthl-java
Description: stylesheets for processing DocBook XML to various output formats
These are modular XSL stylesheets for processing documents composed
with the DocBook XML DTD and its derivatives ("Simplified" DocBook
XML, JRefEntry DTD, etc.).
.
The stylesheets provide XSLT transformations for (X)HTML, WordML, HTML Help,
- JavaHelp, Man page (nroff), Website, Eclipse Platform Help file and Formatting
- Object (FO) output. The latter can be further processed to a number of print
- formats using FOP or TeX-based tools.
+ JavaHelp, Man page (nroff), Website, Eclipse Platform Help file and XSL
+ Formatting Object (XSL-FO) output. The latter can be further processed to
+ a number of print formats using FOP or TeX-based tools.
.
The stylesheets are modular in the sense that you can extend and, to some
extent, customize them. The documentation is included in a separate package.
Modified: packages/docbook-xsl/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/get-orig-source.sh?rev=1884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/get-orig-source.sh (original)
+++ packages/docbook-xsl/trunk/debian/get-orig-source.sh Mon May 16 17:48:13 2011
@@ -6,20 +6,23 @@
ORIG_TARBALL=$3
REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
+REAL_TARBALL_NS=`echo ${REAL_TARBALL} | sed -e "s/docbook-xsl-\(${UPSTREAM_VERSION}\.tar\.gz\)/docbook-xsl-ns-\1/g"`
+REAL_TARBALL_NS_STRIP=`basename ${REAL_TARBALL_NS}`
WORKING_DIR=`dirname ${ORIG_TARBALL}`
+
+[ -f ${REAL_TARBALL_NS} ] || wget -P ${WORKING_DIR} http://downloads.sourceforge.net/docbook/${REAL_TARBALL_NS_STRIP}
ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
-#[ -f ${REAL_TARBALL} ] || wget -P ${WORKING_DIR} \
-# http://downloads.sourceforge.net/docbook/${REAL_TARBALL}
-
-mkdir -p ${ORIG_TARBALL_DIR}
-tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
-rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
-rm -rf ${ORIG_TARBALL_DIR}/extensions/ ${ORIG_TARBALL_DIR}/webhelp/
+mkdir -p ${ORIG_TARBALL_DIR}/docbook-xsl/ ${ORIG_TARBALL_DIR}/docbook-xsl-ns/
+tar --directory=${ORIG_TARBALL_DIR}/docbook-xsl/ --strip 1 -xzf ${REAL_TARBALL} || exit 1
+tar --directory=${ORIG_TARBALL_DIR}/docbook-xsl-ns/ --strip 1 -xzf ${REAL_TARBALL_NS} || exit 1
+rm -f ${ORIG_TARBALL} ${REAL_TARBALL} ${REAL_TARBALL_NS}
+rm -rf ${ORIG_TARBALL_DIR}/docbook-xsl/extensions/ ${ORIG_TARBALL_DIR}/docbook-xsl/webhelp \
+ ${ORIG_TARBALL_DIR}/docbook-xsl-ns/extensions/ ${ORIG_TARBALL_DIR}/docbook-xsl-ns/webhelp/
GZIP=-9 tar --remove-files --directory ${WORKING_DIR} -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR_STRIP} || exit 1
exit 0
Added: packages/docbook-xsl/trunk/debian/patches/605696_fix_section_name_for_lexgrog.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/605696_fix_section_name_for_lexgrog.patch?rev=1884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/605696_fix_section_name_for_lexgrog.patch (added)
+++ packages/docbook-xsl/trunk/debian/patches/605696_fix_section_name_for_lexgrog.patch Mon May 16 17:48:13 2011
@@ -1,0 +1,32 @@
+Fix spanish translation to make lexgrog recognize spanish manual pages header
+information.
+
+http://bugs.debian.org/605696
+http://docbook.svn.sourceforge.net/docbook/?rev=9000&view=rev
+
+--- a/docbook-xsl/common/es.xml
++++ b/docbook-xsl/common/es.xml
+@@ -108,8 +108,8 @@
+ <l:gentext key="Reference" text="Referencia"/>
+ <l:gentext key="reference" text="referencia"/>
+ <l:gentext key="References" text="Referencias"/>
+-<l:gentext key="RefName" text="Nombre de referencia"/>
+-<l:gentext key="refname" text="nombre de referencia"/>
++<l:gentext key="RefName" text="Nombre"/>
++<l:gentext key="refname" text="nombre"/>
+ <l:gentext key="RefSection" text="Sección de referencia"/>
+ <l:gentext key="refsection" text="sección de referencia"/>
+ <l:gentext key="RefSynopsisDiv" text="Sinopsis"/>
+--- a/docbook-xsl-ns/common/es.xml
++++ b/docbook-xsl-ns/common/es.xml
+@@ -108,8 +108,8 @@
+ <l:gentext key="Reference" text="Referencia"/>
+ <l:gentext key="reference" text="referencia"/>
+ <l:gentext key="References" text="Referencias"/>
+-<l:gentext key="RefName" text="Nombre de referencia"/>
+-<l:gentext key="refname" text="nombre de referencia"/>
++<l:gentext key="RefName" text="Nombre"/>
++<l:gentext key="refname" text="nombre"/>
+ <l:gentext key="RefSection" text="Sección de referencia"/>
+ <l:gentext key="refsection" text="sección de referencia"/>
+ <l:gentext key="RefSynopsisDiv" text="Sinopsis"/>
Added: packages/docbook-xsl/trunk/debian/patches/611924_html_same_ids_for_quote.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/611924_html_same_ids_for_quote.patch?rev=1884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/611924_html_same_ids_for_quote.patch (added)
+++ packages/docbook-xsl/trunk/debian/patches/611924_html_same_ids_for_quote.patch Mon May 16 17:48:13 2011
@@ -1,0 +1,66 @@
+A <quote> element with an (xml:)ID will lead to two anchors with the same
+name or ID.
+
+http://bugs.debian.org/611914
+http://docbook.svn.sourceforge.net/docbook/?rev=9003&view=rev
+
+--- a/docbook-xsl/html/inline.xsl
++++ b/docbook-xsl/html/inline.xsl
+@@ -823,7 +823,6 @@
+ </xsl:variable>
+ <span>
+ <xsl:apply-templates select="." mode="common.html.attributes"/>
+- <xsl:call-template name="anchor"/>
+ <xsl:choose>
+ <xsl:when test="$depth mod 2 = 0">
+ <xsl:call-template name="gentext.startquote"/>
+--- a/docbook-xsl/xhtml-1_1/inline.xsl
++++ b/docbook-xsl/xhtml-1_1/inline.xsl
+@@ -795,7 +795,6 @@
+ </xsl:variable>
+ <span>
+ <xsl:apply-templates select="." mode="common.html.attributes"/>
+- <xsl:call-template name="anchor"/>
+ <xsl:choose>
+ <xsl:when test="$depth mod 2 = 0">
+ <xsl:call-template name="gentext.startquote"/>
+--- a/docbook-xsl/xhtml/inline.xsl
++++ b/docbook-xsl/xhtml/inline.xsl
+@@ -795,7 +795,6 @@
+ </xsl:variable>
+ <span>
+ <xsl:apply-templates select="." mode="common.html.attributes"/>
+- <xsl:call-template name="anchor"/>
+ <xsl:choose>
+ <xsl:when test="$depth mod 2 = 0">
+ <xsl:call-template name="gentext.startquote"/>
+--- a/docbook-xsl-ns/html/inline.xsl
++++ b/docbook-xsl-ns/html/inline.xsl
+@@ -824,7 +824,6 @@
+ </xsl:variable>
+ <span>
+ <xsl:apply-templates select="." mode="common.html.attributes"/>
+- <xsl:call-template name="anchor"/>
+ <xsl:choose>
+ <xsl:when test="$depth mod 2 = 0">
+ <xsl:call-template name="gentext.startquote"/>
+--- a/docbook-xsl-ns/xhtml-1_1/inline.xsl
++++ b/docbook-xsl-ns/xhtml-1_1/inline.xsl
+@@ -796,7 +796,6 @@
+ </xsl:variable>
+ <span>
+ <xsl:apply-templates select="." mode="common.html.attributes"/>
+- <xsl:call-template name="anchor"/>
+ <xsl:choose>
+ <xsl:when test="$depth mod 2 = 0">
+ <xsl:call-template name="gentext.startquote"/>
+--- a/docbook-xsl-ns/xhtml/inline.xsl
++++ b/docbook-xsl-ns/xhtml/inline.xsl
+@@ -796,7 +796,6 @@
+ </xsl:variable>
+ <span>
+ <xsl:apply-templates select="." mode="common.html.attributes"/>
+- <xsl:call-template name="anchor"/>
+ <xsl:choose>
+ <xsl:when test="$depth mod 2 = 0">
+ <xsl:call-template name="gentext.startquote"/>
Added: packages/docbook-xsl/trunk/debian/patches/620556_fo_segmentedlist_with_segtitles.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/620556_fo_segmentedlist_with_segtitles.patch?rev=1884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/620556_fo_segmentedlist_with_segtitles.patch (added)
+++ packages/docbook-xsl/trunk/debian/patches/620556_fo_segmentedlist_with_segtitles.patch Mon May 16 17:48:13 2011
@@ -1,0 +1,77 @@
+Segmented lists with more than one segtitle are not properly processed and fop
+will error out, because the number of columns is hardcoded to be 2. Thanks to
+Daniel Burrows for this patch.
+
+http://bugs.debian.org/620556
+http://docbook.svn.sourceforge.net/docbook/?rev=9007&view=rev
+
+--- a/docbook-xsl-ns/fo/lists.xsl
++++ b/docbook-xsl-ns/fo/lists.xsl
+@@ -1197,8 +1197,9 @@
+ <xsl:template match="d:segmentedlist" mode="seglist-table">
+ <xsl:apply-templates select="d:title" mode="list.title.mode" />
+ <fo:table table-layout="fixed">
+- <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
+- <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
++ <xsl:call-template name="segmentedlist.table.columns">
++ <xsl:with-param name="cols" select="count(segtitle)"/>
++ </xsl:call-template>
+ <fo:table-header start-indent="0pt" end-indent="0pt">
+ <fo:table-row>
+ <xsl:apply-templates select="d:segtitle" mode="seglist-table"/>
+@@ -1210,6 +1211,20 @@
+ </fo:table>
+ </xsl:template>
+
++<xsl:template name="segmentedlist.table.columns">
++ <xsl:param name="cols" select="1"/>
++ <xsl:param name="curcol" select="1"/>
++
++ <fo:table-column column-number="{$curcol}"
++ column-width="proportional-column-width(1)"/>
++ <xsl:if test="$curcol < $cols">
++ <xsl:call-template name="segmentedlist.table.columns">
++ <xsl:with-param name="cols" select="$cols"/>
++ <xsl:with-param name="curcol" select="$curcol+1"/>
++ </xsl:call-template>
++ </xsl:if>
++</xsl:template>
++
+ <xsl:template match="d:segtitle" mode="seglist-table">
+ <fo:table-cell>
+ <fo:block font-weight="bold">
+--- a/docbook-xsl/fo/lists.xsl
++++ b/docbook-xsl/fo/lists.xsl
+@@ -1195,8 +1195,9 @@
+ <xsl:template match="segmentedlist" mode="seglist-table">
+ <xsl:apply-templates select="title" mode="list.title.mode" />
+ <fo:table table-layout="fixed">
+- <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
+- <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
++ <xsl:call-template name="segmentedlist.table.columns">
++ <xsl:with-param name="cols" select="count(segtitle)"/>
++ </xsl:call-template>
+ <fo:table-header start-indent="0pt" end-indent="0pt">
+ <fo:table-row>
+ <xsl:apply-templates select="segtitle" mode="seglist-table"/>
+@@ -1208,6 +1209,20 @@
+ </fo:table>
+ </xsl:template>
+
++<xsl:template name="segmentedlist.table.columns">
++ <xsl:param name="cols" select="1"/>
++ <xsl:param name="curcol" select="1"/>
++
++ <fo:table-column column-number="{$curcol}"
++ column-width="proportional-column-width(1)"/>
++ <xsl:if test="$curcol < $cols">
++ <xsl:call-template name="segmentedlist.table.columns">
++ <xsl:with-param name="cols" select="$cols"/>
++ <xsl:with-param name="curcol" select="$curcol+1"/>
++ </xsl:call-template>
++ </xsl:if>
++</xsl:template>
++
+ <xsl:template match="segtitle" mode="seglist-table">
+ <fo:table-cell>
+ <fo:block font-weight="bold">
Added: packages/docbook-xsl/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/series?rev=1884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/series (added)
+++ packages/docbook-xsl/trunk/debian/patches/series Mon May 16 17:48:13 2011
@@ -1,0 +1,3 @@
+620556_fo_segmentedlist_with_segtitles.patch
+611924_html_same_ids_for_quote.patch
+605696_fix_section_name_for_lexgrog.patch
Modified: packages/docbook-xsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/rules?rev=1884&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/rules (original)
+++ packages/docbook-xsl/trunk/debian/rules Mon May 16 17:48:13 2011
@@ -2,19 +2,13 @@
#
# export DH_VERBOSE=1
-PACKAGE = docbook-xsl
-
-include /usr/share/dpatch/dpatch.make
-
-build:: patch-stamp
-clean:: unpatch
-
-%::
+%:
dh $@ --parallel
override_dh_auto_build:
-override_dh_auto_test: check-xml
- # nothing to do in source directory
+override_dh_auto_test:
+ xmllint --noout --noent --nonet \
+ --valid $(CURDIR)/debian/examples/foo.1.example_manpage.xml
override_dh_install:
dh_installxmlcatalogs
@@ -24,12 +18,3 @@
override_dh_installchangelogs:
dh_installchangelogs RELEASE-NOTES.txt
-
-check-xml:
- xmllint --noout --noent --nonet \
- --valid $(CURDIR)/debian/examples/foo.1.example_manpage.xml
-
-get-orig-source:
- uscan --force-download
-
-.PHONY: get-orig-source check-xml
Added: packages/docbook-xsl/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/source/format?rev=1884&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/source/format (added)
+++ packages/docbook-xsl/trunk/debian/source/format Mon May 16 17:48:13 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-xml-sgml-commit
mailing list