[Pkg-asciidoc-commits] r7 - in trunk/debian: . patches

[Fredrik Steen]

Author: stone
Date: 2007-02-19 14:32:43 +0100 (Mon, 19 Feb 2007)
New Revision: 7

Added:
   trunk/debian/patches/a2x-fop-name-fix.patch
Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
 * Patch to change fop.sh to fop in a2x
 * Suggest fop
 * Verify that upstream fixed trailing .sp bug



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-02-19 10:39:21 UTC (rev 6)
+++ trunk/debian/changelog	2007-02-19 13:32:43 UTC (rev 7)
@@ -4,7 +4,9 @@
   * New upstream version (Closes: #395234) 
 
   [ Fredrik Steen ]
+  * Upstream fix for trailing .sp in man-pages (Closes:#386854)
   * Note about fo.xsl in README.Debian (Closes: #344729)
+  * a2x now search and use fop instead of fop.sh (Closes: #376523)
 
  -- Alexander Wirt <formorer at debian.org>  Sat,  3 Feb 2007 14:43:44 +0100
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-02-19 10:39:21 UTC (rev 6)
+++ trunk/debian/control	2007-02-19 13:32:43 UTC (rev 7)
@@ -9,7 +9,7 @@
 Package: asciidoc
 Architecture: all
 Depends: python (>= 2.3)
-Suggests: docbook-utils, xmlto
+Suggests: docbook-utils, xmlto, fop
 Description: Highly configurable text format for writing documentation
  AsciiDoc is a text document format for writing articles, books, manuals and
  UNIX man pages. AsciiDoc files can be translated to HTML (with or without

Added: trunk/debian/patches/a2x-fop-name-fix.patch
===================================================================
--- trunk/debian/patches/a2x-fop-name-fix.patch	2007-02-19 10:39:21 UTC (rev 6)
+++ trunk/debian/patches/a2x-fop-name-fix.patch	2007-02-19 13:32:43 UTC (rev 7)
@@ -0,0 +1,20 @@
+--- a2x 2006-08-22 00:35:47.000000000 +0200
++++ a2x.stone   2007-02-19 14:18:08.000000000 +0100
+@@ -480,7 +480,7 @@ function to_manpage()
+ function to_pdf()
+ {
+     require "xsltproc"
+-    require "fop.sh"
++    require "fop"
+     local xsl xml fo pdf
+     xsl=$(conf_file docbook-xsl/fo.xsl)
+     if [ ! -r "$xsl" ]; then
+@@ -492,7 +492,7 @@ function to_pdf()
+     to_docbook
+     execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \
+         \"$xsl\" \"$xml\" >\"$fo\""
+-    execute_command_2 "fop.sh \"$fo\" \"$pdf\""
++    execute_command_2 "fop \"$fo\" \"$pdf\""
+ }
+ 
+ function to_odt()