[xml/sgml-commit] r842 - in /packages/docbook-xsl/trunk/debian: NEWS changelog docbook-xsl.examples examples/foo.1.example_manpage.xml patches/00list patches/02_use_global_papersize_conf.dpatch patches/11_charmap_imports_fix.dpatch rules
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Mon Aug 20 01:32:19 UTC 2007
Author: dleidert-guest
Date: Mon Aug 20 01:32:19 2007
New Revision: 842
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=842
Log:
* debian/docbook-xsl.examples: Removed the Makefiles.
* debian/rules (binary-indep): Added more files, that can be ignored.
* debian/examples/foo.1.example_manpage.xml: Removed the <date> tag
(automatically produced by docbook-xsl) - thanks to Charles Plessy. Also
fixed the <productname> description.
* debian/patches/02_use_global_papersize_conf.dpatch: Added.
- The default value for page.type is read from /etc/papersize (closes:
#173093, #382505).
* debian/patches/11_charmap_imports_fix.dpatch: Added.
- Import the missing stylesheet.
Added:
packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch (with props)
packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch (with props)
Modified:
packages/docbook-xsl/trunk/debian/NEWS
packages/docbook-xsl/trunk/debian/changelog
packages/docbook-xsl/trunk/debian/docbook-xsl.examples
packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml
packages/docbook-xsl/trunk/debian/patches/00list
packages/docbook-xsl/trunk/debian/rules
Modified: packages/docbook-xsl/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/NEWS?rev=842&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/NEWS (original)
+++ packages/docbook-xsl/trunk/debian/NEWS Mon Aug 20 01:32:19 2007
@@ -1,3 +1,25 @@
+docbook-xsl (1.73.0.dfsg.1-1) UNRELEASED; urgency=low
+
+ Footnote handling in the current manpages code pretty much assumes that you
+ if you have a table or list or something in footnote, it's always preceded
+ by some text -- like, <foonote><para>The following list shows foo
+ bar...<itemizedlist> ... </footnote> instead of
+ <footnote><itemizedlist>...</footnote> or <footnote><table>...</footnote>.
+ See the release notes in /usr/share/doc/docbook-xsl/changelog.gz for a more
+ detailed explanation and other important hints.
+
+ Further a special (Debiyn-only) patch has been implemented to fix the bugs
+ #173093 and #382505. In these reports it was requested, that the default
+ value of the paper.type parameter is set accordingly to the value in
+ /etc/papersize. This patch is considered to be experimental. Don't bug
+ upstream with issues, if you observe one - only bug me (and the Debian BTS).
+ A further limitation is, that only the values, that are shared between
+ the paper.type parameter values of docbook-xsl and the papersize values are
+ currently supported. Otherwise, the code will fall back to the default
+ 'USletter'.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Thu, 26 Jul 2007 01:56:43 +0200
+
docbook-xsl (1.72.0.dfsg.1-1) unstable; urgency=low
The docbook-xsl-doc package was split into 3 packages:
Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=842&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon Aug 20 01:32:19 2007
@@ -8,8 +8,13 @@
[ Daniel Leidert ]
* debian/control (Recommends): Removed recommending a web-server (closes:
#431096).
+ * debian/docbook-xsl.examples: Removed the Makefiles.
+ * debian/rules (binary-indep): Added more files, that can be ignored.
* debian/watch: Added. Because the usual sf.net watch file syntax failes, I
use the ftp site.
+ * debian/examples/foo.1.example_manpage.xml: Removed the <date> tag
+ (automatically produced by docbook-xsl) - thanks to Charles Plessy. Also
+ fixed the <productname> description.
* debian/patches/01_create_debian_catalog.dpatch: Updated for this release.
* debian/patches/10_man_fix_indentation_issues.dpatch: Removed. Applied
upstream.
@@ -32,12 +37,17 @@
* debian/patches/80_common_locale_fixes.dpatch: Ditto.
* debian/patches/81_common_xalan_bug_workaround.dpatch: Ditto.
* debian/patches/82_fix_doc_typos.dpatch: Ditto.
+ * debian/patches/02_use_global_papersize_conf.dpatch: Added.
+ - The default value for page.type is read from /etc/papersize (closes:
+ #173093, #382505).
* debian/patches/10_7129_fix_abstract_title_condition_check.dpatch: Added.
- Fixed test for abstract.notitle.enabled to work accordingly to the
documentation.
+ * debian/patches/11_charmap_imports_fix.dpatch: Added.
+ - Import the missing stylesheet.
* debian/patches/00list: Adjusted.
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Mon, 23 Jul 2007 01:34:58 +0200
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Mon, 20 Aug 2007 03:31:00 +0200
docbook-xsl (1.72.0.dfsg.1-2) unstable; urgency=low
Modified: packages/docbook-xsl/trunk/debian/docbook-xsl.examples
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.examples?rev=842&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.examples (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.examples Mon Aug 20 01:32:19 2007
@@ -1,3 +1,1 @@
-tools/make/Makefile.*
-
debian/examples/foo.1.example_manpage.xml
Modified: packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml?rev=842&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml (original)
+++ packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml Mon Aug 20 01:32:19 2007
@@ -22,8 +22,6 @@
<!-- The version information can also be suppressed (just -->
<!-- remove it or comment it out. -->
<!ENTITY dhrelease "0.1.2">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "2006-08-27">
<!-- TITLE should be something like "User commands", -->
<!-- "&dhpackage; command-line reference" or similar (see e.g. -->
@@ -31,11 +29,13 @@
<!-- the length to 30 chars. -->
<!ENTITY dhtitle "User Manuals">
+ <!-- This is the application/package name. -->
<!ENTITY dhucpackage "FOO">
<!ENTITY dhpackage "foo">
<!-- If the application e.g. belongs to a package like X.org, -->
- <!-- this should be set to the its name instead. -->
+ <!-- this should be set to the package/suite name instead of -->
+ <!-- dhpackage. -->
<!ENTITY dhproduct "&dhpackage;">
<!-- SECTION should be 1-8, maybe w/ subsection other -->
@@ -48,9 +48,9 @@
<refentry>
<refentryinfo>
<title>&dhtitle;</title>
- <productname>&dhpackage;</productname>
+ <!-- Better put a suite name instead of &dhpackage; into
+ <productname>&dhproduct;</productname>
<releaseinfo role="version">&dhrelease;</releaseinfo>
- <date>&dhdate;</date>
<authorgroup>
<author>
<firstname>Jens</firstname>
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=842&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Mon Aug 20 01:32:19 2007
@@ -1,2 +1,4 @@
01_create_debian_catalog
-10_7129_fix_abstract_title_condition_check.dpatch
+02_use_global_papersize_conf
+10_7129_fix_abstract_title_condition_check
+11_charmap_imports_fix
Added: packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch?rev=842&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch Mon Aug 20 01:32:19 2007
@@ -1,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_use_global_papersize_conf.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Several people requested, that the defaut value for $paper.type is read
+## DP: from /etc/papersize. This patch adds experimental support. It simply
+## DP: reads /etc/papersize (as SYSTEM entity) and puts the content into
+## DP: $my.paper.type. Then it's evaluated and translated into docbook-xsl
+## DP: values.
+## DP:
+## DP: NOTE: The patch consists of 3 parts:
+## DP: (1) The page.type parameter fix.
+## DP: (2) The update of the documentation for the page.type parameter.
+## DP: (3) The verbose output to make sure, the user understands, what's
+## DP: going on.
+## DP:
+## DP: <URL:http://bugs.debian.org/173093>
+## DP: <URL:http://bugs.debian.org/382505>
+
+ at DPATCH@
+diff -urNad trunk~/doc/fo/paper.type.html trunk/doc/fo/paper.type.html
+--- trunk~/doc/fo/paper.type.html 2007-07-22 19:29:28.000000000 +0200
++++ trunk/doc/fo/paper.type.html 2007-07-26 03:32:03.000000000 +0200
+@@ -16,6 +16,13 @@
+ B, and C sizes. See <code class="literal">page.width.portrait</code>, for example.
+ </p>
+
++<p><b>Important note for Debian users:</b> Because of the Debian bugs
++<a href="http://bugs.debian.org/173093">#173093</a>
++and <a href="http://bugs.debian.org/382505">#382505</a> the default value is read
++from <tt>/etc/papersize</tt>. only the a{0..10}, b{0..4} and letter values of
++<b>papersize</b>(5) are currently supported.
++</p>
++
+ </div>
+ </div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="page.width.portrait.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="general.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="double.sided.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">page.width.portrait </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> double.sided</td></tr></table></div></body></html>
+
+diff -urNad trunk~/fo/docbook.xsl trunk/fo/docbook.xsl
+--- trunk~/fo/docbook.xsl 2007-06-29 01:23:31.000000000 +0200
++++ trunk/fo/docbook.xsl 2007-07-26 03:32:03.000000000 +0200
+@@ -324,6 +324,15 @@
+ <xsl:value-of select="$page.height"/>
+ <xsl:text>)</xsl:text>
+ </xsl:message>
++ <!-- Tell users about solution of bugs #173093 and #382505. -->
++ <xsl:message>
++*** IMPORTANT: The value for the paper type may be read from ***
++*** IMPORTANT: /etc/papersize accordingly to Debian bug reports ***
++*** IMPORTANT: #173093 and #382505. This special patch is NOT ***
++*** IMPORTANT: part of the original docbook-xsl package. So don't ***
++*** IMPORTANT: bug upstream with issues about this (if you ***
++*** IMPORTANT: observe one) - instead write to Debian's BTS. ***
++ </xsl:message>
+ </xsl:template>
+
+ <!-- ==================================================================== -->
+diff -urNad trunk~/fo/param.xsl trunk/fo/param.xsl
+--- trunk~/fo/param.xsl 2007-07-22 19:27:57.000000000 +0200
++++ trunk/fo/param.xsl 2007-07-26 03:34:11.000000000 +0200
+@@ -1,4 +1,8 @@
+ <?xml version="1.0" encoding="ASCII"?>
++<!DOCTYPE xsl:stylesheet [
++ <!ENTITY papersize SYSTEM "/etc/papersize">
++]>
++
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <!-- This file is generated from param.xweb -->
+@@ -545,7 +549,31 @@
+ <xsl:otherwise>8.5in</xsl:otherwise>
+ </xsl:choose>
+ </xsl:param>
+-<xsl:param name="paper.type" select="'USletter'"/>
++<!-- The following is a solution to Debian bugs #173093 and #382505. -->
++<xsl:param name="paper.type">
++ <xsl:variable name="my.paper.type.raw">&papersize;</xsl:variable>
++ <xsl:variable name="my.paper.type" select="normalize-space($my.paper.type.raw)"/>
++ <xsl:choose>
++ <xsl:when test="$my.paper.type = 'a0'">A0</xsl:when>
++ <xsl:when test="$my.paper.type = 'a1'">A1</xsl:when>
++ <xsl:when test="$my.paper.type = 'a2'">A2</xsl:when>
++ <xsl:when test="$my.paper.type = 'a3'">A3</xsl:when>
++ <xsl:when test="$my.paper.type = 'a4'">A4</xsl:when>
++ <xsl:when test="$my.paper.type = 'a5'">A5</xsl:when>
++ <xsl:when test="$my.paper.type = 'a6'">A6</xsl:when>
++ <xsl:when test="$my.paper.type = 'a7'">A7</xsl:when>
++ <xsl:when test="$my.paper.type = 'a8'">A8</xsl:when>
++ <xsl:when test="$my.paper.type = 'a9'">A9</xsl:when>
++ <xsl:when test="$my.paper.type = 'a10'">A10</xsl:when>
++ <xsl:when test="$my.paper.type = 'b0'">B0</xsl:when>
++ <xsl:when test="$my.paper.type = 'b1'">B1</xsl:when>
++ <xsl:when test="$my.paper.type = 'b2'">B2</xsl:when>
++ <xsl:when test="$my.paper.type = 'b3'">B3</xsl:when>
++ <xsl:when test="$my.paper.type = 'b4'">B4</xsl:when>
++ <!-- otherwise fall back to to upstreams default -->
++ <xsl:otherwise>USletter</xsl:otherwise>
++ </xsl:choose>
++</xsl:param>
+ <xsl:param name="part.autolabel" select="'I'"/>
+ <xsl:param name="passivetex.extensions" select="0"/>
+ <xsl:attribute-set name="pgwide.properties">
Propchange: packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch?rev=842&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch (added)
+++ packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch Mon Aug 20 01:32:19 2007
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_charmap_imports_fix.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 7153 (Michael Smith):
+## DP: Added import of common/charmap.xsl to fix problem of calls to
+## DP: missing named templates.
+## DP:
+## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=7153&view=rev>
+
+ at DPATCH@
+diff -urNad trunk~/manpages/docbook.xsl trunk/manpages/docbook.xsl
+--- trunk~/manpages/docbook.xsl 2007-07-22 13:55:22.000000000 +0200
++++ trunk/manpages/docbook.xsl 2007-08-11 04:25:24.000000000 +0200
+@@ -26,6 +26,7 @@
+ <!-- ==================================================================== -->
+
+ <xsl:include href="../common/refentry.xsl"/>
++ <xsl:include href="../common/charmap.xsl"/>
+ <xsl:include href="param.xsl"/>
+ <xsl:include href="utility.xsl"/>
+ <xsl:include href="info.xsl"/>
Propchange: packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/docbook-xsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/rules?rev=842&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/rules (original)
+++ packages/docbook-xsl/trunk/debian/rules Mon Aug 20 01:32:19 2007
@@ -33,7 +33,9 @@
dh_installdocs
dh_installexamples
dh_installxmlcatalogs
- dh_install -Ndocbook-xsl-doc-html -Xparam.xml -XChangeLog*
+ # upstream ships {param,pi,table}.xml as example for DocBook
+ # because we don't need them inside docbook-xsl, we exclude them
+ dh_install -Ndocbook-xsl-doc-html -Xparam.xml -Xpi.xml -Xtable.xml -XChangeLog* -X.param.* -X.lib.*
dh_install -pdocbook-xsl-doc-html -Xreference.{pdf,txt}.gz -XAUTHORS -XCOPYING -XREADME
dh_link
dh_compress
More information about the debian-xml-sgml-commit
mailing list