[xml/sgml-commit] r1684 - in /packages/xmlto/trunk/debian: changelog patches/00list patches/extensions_fix.dpatch

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

Author: dleidert-guest
Date: Sat Jan 23 15:23:00 2010
New Revision: 1684

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1684
Log:
* debian/patches/extensions_fix.dpatch: Fix extensions logic: Set
  fop1.extensions and passivetex.extenions independent from the
  --extensions switch. Further fop.extensions is useless on Debian
  with fop 0.95.
* debian/patches/00list: Adjusted.

Added:
    packages/xmlto/trunk/debian/patches/extensions_fix.dpatch   (with props)
Modified:
    packages/xmlto/trunk/debian/changelog
    packages/xmlto/trunk/debian/patches/00list

Modified: packages/xmlto/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/changelog?rev=1684&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Sat Jan 23 15:23:00 2010
@@ -1,6 +1,11 @@
 xmlto (0.0.23-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * debian/patches/extensions_fix.dpatch: Fix extensions logic: Set
+    fop1.extensions and passivetex.extenions independent from the
+    --extensions switch. Further fop.extensions is useless on Debian
+    with fop 0.95.
+  * debian/patches/00list: Adjusted.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 24 Sep 2009 11:26:39 +0200
 

Modified: packages/xmlto/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/00list?rev=1684&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/00list (original)
+++ packages/xmlto/trunk/debian/patches/00list Sat Jan 23 15:23:00 2010
@@ -1,1 +1,2 @@
 format_fo_passivetex_check
+extensions_fix

Added: packages/xmlto/trunk/debian/patches/extensions_fix.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/extensions_fix.dpatch?rev=1684&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/extensions_fix.dpatch (added)
+++ packages/xmlto/trunk/debian/patches/extensions_fix.dpatch Sat Jan 23 15:23:00 2010
@@ -1,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## extensions_fix.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debian has fop 0.9x so we use fop1.extensions. Further the logic is
+## DP:   wrong to only enable fop1/passivetex extensions if --extensions
+## DP:   was used. use.extensions is AFAIK unrelated to fop1.extensions
+## DP:   and passivetex.extensions, so they should not rely on EXTENSIONS
+## DP:   being set.
+
+ at DPATCH@
+diff -urNad trunk~/xmlto.in trunk/xmlto.in
+--- trunk~/xmlto.in	2009-09-21 14:41:17.000000000 +0200
++++ trunk/xmlto.in	2010-01-23 13:27:18.108509009 +0100
+@@ -341,7 +341,7 @@
+ 		echo >&2 Warning: fop not found or not executable.
+ 		echo >&2 Using default backend...
+ 	else
+-		USE_BACKEND="FOP"
++		USE_BACKEND=FOP
+ 	fi
+ 	shift
+ 	;;
+@@ -352,7 +352,7 @@
+ 		echo >&2 Warning: dblatex not found or not executable.
+ 		echo >&2 Using default backend...
+ 	else
+-		USE_BACKEND="DBLATEX"
++		USE_BACKEND=DBLATEX
+ 	fi
+ 	shift
+ 	;;
+@@ -364,18 +364,16 @@
+ done
+ 
+ ##here we would decide which extensions should be active
+-if [ "$EXTENSIONS" -eq 1 ]
+-then
+-  case "$USE_BACKEND" in
++case "$USE_BACKEND" in
+   FOP)
+-      #maybe fop1.extensions for latest fop, but keeping this one
+-      XSLTOPTS="$XSLTOPTS --param fop.extensions '1'" ;;
++	#maybe fop1.extensions for latest fop, but keeping this one
++	#Debian fix for fop 0.9x
++	XSLTOPTS="$XSLTOPTS --param fop1.extensions '1'" ;;
+   DBLATEX)
+-      ;;
++	;;
+   DEFAULT)
+-      XSLTOPTS="$XSLTOPTS --param passivetex.extensions '1'" ;;
+-  esac
+-fi
++	XSLTOPTS="$XSLTOPTS --param passivetex.extensions '1'" ;;
++esac
+ 
+ if [ "$#" != "2" ]
+ then

Propchange: packages/xmlto/trunk/debian/patches/extensions_fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *