[xml/sgml-commit] r2000 - in /packages/xmlto/trunk/debian: changelog control patches/652974_local_only_in_function.patch patches/getopt_noextensions_fix.patch patches/series
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Sun May 20 09:59:33 UTC 2012
Author: dleidert-guest
Date: Sun May 20 09:59:32 2012
New Revision: 2000
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2000
Log:
* debian/control (Standards-Version): Bumped to 3.9.3.
* debian/patches/652974_local_only_in_function.patch: Added.
- Fix warning about local builtin used (closes: #652974).
* debian/patches/getopt_noextensions_fix.patch: Added.
- Fix the noextensions recognition by getopt.
* debian/patches/series: Adjusted.
Added:
packages/xmlto/trunk/debian/patches/652974_local_only_in_function.patch
packages/xmlto/trunk/debian/patches/getopt_noextensions_fix.patch
Modified:
packages/xmlto/trunk/debian/changelog
packages/xmlto/trunk/debian/control
packages/xmlto/trunk/debian/patches/series
Modified: packages/xmlto/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/changelog?rev=2000&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/changelog (original)
+++ packages/xmlto/trunk/debian/changelog Sun May 20 09:59:32 2012
@@ -2,6 +2,12 @@
* NOT RELEASED YET
* debian/control (Recommends): Added zip for epub format (closes: #653187).
+ (Standards-Version): Bumped to 3.9.3.
+ * debian/patches/652974_local_only_in_function.patch: Added.
+ - Fix warning about local builtin used (closes: #652974).
+ * debian/patches/getopt_noextensions_fix.patch: Added.
+ - Fix the noextensions recognition by getopt.
+ * debian/patches/series: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sat, 03 Dec 2011 01:53:53 +0100
Modified: packages/xmlto/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/control?rev=2000&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/control (original)
+++ packages/xmlto/trunk/debian/control Sun May 20 09:59:32 2012
@@ -3,9 +3,13 @@
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>> 7.0.50~), docbook-xsl (>= 1.64.1.0),
- docbook-xml (>= 4.2-8), libxml2-utils, sgml-base, xsltproc (>= 1.0.29)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>> 7.0.50~),
+ docbook-xml (>= 4.2-8),
+ docbook-xsl (>= 1.64.1.0),
+ libxml2-utils,
+ sgml-base,
+ xsltproc (>= 1.0.29)
+Standards-Version: 3.9.3
Homepage: https://fedorahosted.org/xmlto/
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xmlto/trunk/
@@ -14,11 +18,16 @@
Package: xmlto
Architecture: any
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, xsltproc (>= 1.1.12-8),
- docbook-xsl (>= 1.64.1.0), docbook-xml (>= 4.2-8), debianutils (>= 1.16),
- libxml2-utils, sgml-base
-Recommends: libpaper-utils, dblatex | fop, zip
-Suggests: xmltex (>= 1.9.debian.1), w3m | lynx-cur | links
+Depends: debianutils (>= 1.16),
+ docbook-xml (>= 4.2-8),
+ docbook-xsl (>= 1.64.1.0),
+ libxml2-utils,
+ sgml-base,
+ xsltproc (>= 1.1.12-8),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: dblatex | fop, libpaper-utils, zip
+Suggests: w3m | lynx-cur | links, xmltex (>= 1.9.debian.1)
Description: XML-to-any converter
xmlto is a front-end to an XSL toolchain. It chooses an appropriate
stylesheet for the conversion you want and applies it using an external
Added: packages/xmlto/trunk/debian/patches/652974_local_only_in_function.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/652974_local_only_in_function.patch?rev=2000&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/652974_local_only_in_function.patch (added)
+++ packages/xmlto/trunk/debian/patches/652974_local_only_in_function.patch Sun May 20 09:59:32 2012
@@ -1,0 +1,56 @@
+Author: Ondrej Vasik <ovasik at redhat.com>
+Description: Fix warning about local builtin used.
+Origin: https://fedorahosted.org/xmlto/changeset?reponame=&new=71%40xmlto.in&old=67%40xmlto.in
+Bug-Debian: http://bugs.debian.org/652974
+
+--- a/xmlto.in
++++ b/xmlto.in
+@@ -95,6 +95,24 @@
+ fi
+ }
+
++compute_searchpath () {
++ local oldIFS="${IFS}"
++ IFS=":"
++ for asearchpath in "$1"; do
++ # wrangle relative paths into absolute ones so that the user
++ # isn't surprised if he does ``--searchpath .''
++ case "${asearchpath}" in
++ /*) ;;
++ *) asearchpath="${PWD}/${asearchpath}" ;;
++ esac
++ SEARCHPATH="${SEARCHPATH}${XML_SEARCHPATH_SEPARATOR}${asearchpath}"
++ # we only need a colon if more than one path is in the searchpath
++ # and only after the first iteration.
++ XML_SEARCHPATH_SEPARATOR=":"
++ done
++ IFS="${oldIFS}"
++}
++
+ # Allow FORMAT_DIR to be over-ridden, so that we can be
+ # run from the build directory.
+ prefix=@prefix@
+@@ -322,22 +340,7 @@
+ shift
+ ;;
+ --searchpath)
+- local oldIFS="${IFS}"
+- IFS=":"
+- for asearchpath in "$2"; do
+- # wrangle relative paths into absolute ones so that the user
+- # isn't surprised if he does ``--searchpath .''
+- case "${asearchpath}" in
+- /*) ;;
+- *) asearchpath="${PWD}/${asearchpath}" ;;
+- esac
+- SEARCHPATH="${SEARCHPATH}${XML_SEARCHPATH_SEPARATOR}${asearchpath}"
+- # we only need a colon if more than one path is in the searchpath
+- # and only after the first iteration.
+- XML_SEARCHPATH_SEPARATOR=":"
+- done
+- IFS="${oldIFS}"
+-
++ compute_searchpath "$2"
+ # This is the cleanest method I can think of, but requires calls to
+ # xmllint and xsltproc to be run through eval --ohnobinki
+ [ -n "${SEARCHPATH}" ] && SEARCHPATH_FORMATTED="--path \"${SEARCHPATH}\""
Added: packages/xmlto/trunk/debian/patches/getopt_noextensions_fix.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/getopt_noextensions_fix.patch?rev=2000&op=file
==============================================================================
--- packages/xmlto/trunk/debian/patches/getopt_noextensions_fix.patch (added)
+++ packages/xmlto/trunk/debian/patches/getopt_noextensions_fix.patch Sun May 20 09:59:32 2012
@@ -1,0 +1,15 @@
+Author: Matthias Andree <mandree at freebsd.org>
+Description: Fix the noextensions recognition by getopt.
+Origin: https://fedorahosted.org/xmlto/changeset/72
+
+--- a/xmlto.in
++++ b/xmlto.in
+@@ -262,7 +262,7 @@
+
+ # Process any options
+ ARGS=$(${GETOPT} \
+- --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \
++ --longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,noextensions,with-fop,with-dblatex \
+ -n xmlto -- x:m:o:p:v "$@")
+ [ $? != 0 ] && { usage; exit 1; }
+ eval set -- "$ARGS"
Modified: packages/xmlto/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlto/trunk/debian/patches/series?rev=2000&op=diff
==============================================================================
--- packages/xmlto/trunk/debian/patches/series (original)
+++ packages/xmlto/trunk/debian/patches/series Sun May 20 09:59:32 2012
@@ -1,1 +1,3 @@
+getopt_noextensions_fix.patch
+652974_local_only_in_function.patch
format_fo_passivetex_check.patch
More information about the debian-xml-sgml-commit
mailing list