[xml/sgml-commit] r844 - in /packages/docbook-xsl/trunk/debian: ./ patches/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Mon Aug 20 02:10:44 UTC 2007 

Author: dleidert-guest
Date: Mon Aug 20 02:10:41 2007
New Revision: 844

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=844
Log:
* debian/patches/01_create_debian_catalog.dpatch: Adjusted.
* debian/patches/02_use_global_papersize_conf.dpatch: Adjusted.
* debian/patches/10_7129_fix_abstract_title_condition_check.dpatch: Removed.
  Applied upstream.
* debian/patches/11_charmap_imports_fix.dpatch: Ditto.
* debian/patches/00list: Adjusted.

* debian/watch: Moved the comment about the syntax into the file.
* debian/NEWS: Updated.


Removed:
    packages/docbook-xsl/trunk/debian/patches/10_7129_fix_abstract_title_condition_check.dpatch
    packages/docbook-xsl/trunk/debian/patches/11_charmap_imports_fix.dpatch
Modified:
    packages/docbook-xsl/trunk/debian/NEWS
    packages/docbook-xsl/trunk/debian/changelog
    packages/docbook-xsl/trunk/debian/patches/00list
    packages/docbook-xsl/trunk/debian/patches/01_create_debian_catalog.dpatch
    packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch
    packages/docbook-xsl/trunk/debian/watch

Modified: packages/docbook-xsl/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/NEWS?rev=844&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/NEWS (original)
+++ packages/docbook-xsl/trunk/debian/NEWS Mon Aug 20 02:10:41 2007
@@ -1,24 +1,45 @@
-docbook-xsl (1.73.0.dfsg.1-1) UNRELEASED; urgency=low
+docbook-xsl (1.73.0.dfsg.1-1) unstable; 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.
+  In the 1.72.0 release there was a regression regarding the backslash,
+    dot and dash handling, that lead to several "broken" manpages, showing
+    visible man macros. These issues wer almost caused by some non-compliant
+    custom templates. In the following bug reports
 
-  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'.
+    <URL:http://bugs.debian.org/415488> (docbook-xsl)
+    <URL:http://bugs.debian.org/415468> (aptitude)
+    <URL:http://bugs.debian.org/420114> (git-core)
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 26 Jul 2007 01:56:43 +0200
+    you can read more about the details and probelms. With the 1.73 release,
+    upstream reverted this change and restored the pre-1.72 behaviour.
+    However, whenever you need to make some text bold or italic in manpages,
+    read the comments in
+    /usr/share/xml/docbook/stylesheet/nwalsh/manpages/utility.xsl about the
+    available bold/italic named templates or ask for assistence to avoid the
+    same issues in the future.
+
+  Footnote handling in the current manpages code pretty much assumes that,
+    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 (Debian-only) patch has been implemented to fix the bugs
+
+    <URL:http://bugs.debian.org/173093>
+    <URL:http://bugs.debian.org/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>  Mon, 20 Aug 2007 03:55:18 +0200
 
 docbook-xsl (1.72.0.dfsg.1-1) unstable; urgency=low
 

Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=844&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon Aug 20 02:10:41 2007
@@ -3,6 +3,14 @@
   * NOT RELEASED YET
   * New upstream release 1.73.1.
     - Stable bug-fix release for the 1.73 series.
+
+  [ Daniel Leidert ]
+  * debian/patches/01_create_debian_catalog.dpatch: Adjusted.
+  * debian/patches/02_use_global_papersize_conf.dpatch: Adjusted.
+  * debian/patches/10_7129_fix_abstract_title_condition_check.dpatch: Removed.
+    Applied upstream.
+  * debian/patches/11_charmap_imports_fix.dpatch: Ditto.
+  * debian/patches/00list: Adjusted.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 20 Aug 2007 03:32:38 +0200
 
@@ -17,8 +25,7 @@
     #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/watch: Added.
   * 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.

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=844&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/00list (original)
+++ packages/docbook-xsl/trunk/debian/patches/00list Mon Aug 20 02:10:41 2007
@@ -1,4 +1,2 @@
 01_create_debian_catalog
 02_use_global_papersize_conf
-10_7129_fix_abstract_title_condition_check
-11_charmap_imports_fix

Modified: packages/docbook-xsl/trunk/debian/patches/01_create_debian_catalog.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/01_create_debian_catalog.dpatch?rev=844&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/01_create_debian_catalog.dpatch (original)
+++ packages/docbook-xsl/trunk/debian/patches/01_create_debian_catalog.dpatch Mon Aug 20 02:10:41 2007
@@ -6,16 +6,16 @@
 
 @DPATCH@
 diff -urNad trunk~/catalog.xml trunk/catalog.xml
---- trunk~/catalog.xml	2007-07-22 19:28:13.000000000 +0200
-+++ trunk/catalog.xml	2007-07-25 00:57:14.000000000 +0200
-@@ -1,8 +1,23 @@
- <?xml version="1.0" encoding="utf-8"?>
+--- trunk~/catalog.xml	2007-08-19 15:37:15.000000000 +0200
++++ trunk/catalog.xml	2007-08-20 03:42:13.000000000 +0200
+@@ -1,7 +1,23 @@
++<?xml version="1.0" encoding="utf-8"?>
  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <!-- XML Catalog file for DocBook XSL Stylesheets v1.73.0 -->
+ <!-- XML Catalog file for DocBook XSL Stylesheets v1.73.1 -->
 -   <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
 -   <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/" rewritePrefix="./"/>
--   <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.73.0/" rewritePrefix="./"/>
--   <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.73.0/" rewritePrefix="./"/>
+-   <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl/1.73.1/" rewritePrefix="./"/>
+-   <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.73.1/" rewritePrefix="./"/>
 +<!--                                                      -->
 +<!-- ******* adjusted for the Debian distribution ******* -->
 +
@@ -28,11 +28,11 @@
 +    rewritePrefix="file:///usr/share/xml/docbook/stylesheet/nwalsh/"/>
 +
 +  <rewriteURI
-+    uriStartString="http://docbook.sourceforge.net/release/xsl/1.73.0/"
++    uriStartString="http://docbook.sourceforge.net/release/xsl/1.73.1/"
 +    rewritePrefix="file:///usr/share/xml/docbook/stylesheet/nwalsh/"/>
 +
 +  <rewriteSystem
-+    systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.73.0/"
++    systemIdStartString="http://docbook.sourceforge.net/release/xsl/1.73.1/"
 +    rewritePrefix="file:///usr/share/xml/docbook/stylesheet/nwalsh/"/>
 +
  </catalog>

Modified: 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=844&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch (original)
+++ packages/docbook-xsl/trunk/debian/patches/02_use_global_papersize_conf.dpatch Mon Aug 20 02:10:41 2007
@@ -19,11 +19,11 @@
 
 @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>
+--- trunk~/doc/fo/paper.type.html	2007-08-19 15:39:29.000000000 +0200
++++ trunk/doc/fo/paper.type.html	2007-08-20 04:02:11.000000000 +0200
+@@ -17,6 +17,12 @@
+ The list of known paper sizes includes USletter and most of the A,
+ B, and C sizes. See <a href="../fo/page.width.portrait.html"><em class="parameter"><code>page.width.portrait</code></em></a>, for example.
  
 +<p><b>Important note for Debian users:</b> Because of the Debian bugs
 +<a href="http://bugs.debian.org/173093">#173093</a>
@@ -31,13 +31,12 @@
 +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>
+ 
+ </p>
  
 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
++++ trunk/fo/docbook.xsl	2007-08-20 04:03:29.000000000 +0200
 @@ -324,6 +324,15 @@
      <xsl:value-of select="$page.height"/>
      <xsl:text>)</xsl:text>
@@ -55,22 +54,21 @@
  
  <!-- ==================================================================== -->
 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 @@
+--- trunk~/fo/param.xsl	2007-08-19 15:37:00.000000000 +0200
++++ trunk/fo/param.xsl	2007-08-20 04:04:58.000000000 +0200
+@@ -1,4 +1,7 @@
  <?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 @@
+@@ -547,7 +550,31 @@
      <xsl:otherwise>8.5in</xsl:otherwise>
    </xsl:choose>
  </xsl:param>
--<xsl:param name="paper.type" select="'USletter'"/>
+-<xsl:param name="paper.type">USletter</xsl:param>
 +<!-- 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>
@@ -96,6 +94,6 @@
 +    <xsl:otherwise>USletter</xsl:otherwise>
 +  </xsl:choose>
 +</xsl:param>
- <xsl:param name="part.autolabel" select="'I'"/>
+ <xsl:param name="part.autolabel">I</xsl:param>
  <xsl:param name="passivetex.extensions" select="0"/>
  <xsl:attribute-set name="pgwide.properties">

Modified: packages/docbook-xsl/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/watch?rev=844&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/watch (original)
+++ packages/docbook-xsl/trunk/debian/watch Mon Aug 20 02:10:41 2007
@@ -2,6 +2,8 @@
 #
 # NOTE: You need to call the get-orig-source target in debian/rules.
 # NOTE: uupdate will *NOT* work, because upstream splits the packages.
+#
+# Because the usual sf.net watch file syntax fails, use the ftp site.
 
 version=3
 opts=dversionmangle=s/\.dfsg\.\d+$// \

More information about the debian-xml-sgml-commit mailing list