Hello community, here is the log from the commit of package itstool for openSUSE:Factory checked in at 2013-11-26 06:10:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/itstool (Old) and /work/SRC/openSUSE:Factory/.itstool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "itstool" Changes: -------- --- /work/SRC/openSUSE:Factory/itstool/itstool.changes 2013-11-25 14:33:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.itstool.new/itstool.changes 2013-11-26 06:10:18.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 25 08:50:55 UTC 2013 - [email protected] + +- Add itstool-fix-crash.patch: Fixed crash in locale filter and + drop rule (bgo#71511). + +------------------------------------------------------------------- +Sun Nov 24 12:53:53 UTC 2013 - [email protected] + +- Update to version 2.0.1: + + Reworked default ITS rules for better performance. + +------------------------------------------------------------------- @@ -12 +24 @@ - + Fixed handling od namespace prefixes on elements. + + Fixed handling of namespace prefixes on elements. Old: ---- itstool-2.0.0.tar.bz2 New: ---- itstool-2.0.1.tar.bz2 itstool-fix-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ itstool.spec ++++++ --- /var/tmp/diff_new_pack.o0P33u/_old 2013-11-26 06:10:18.000000000 +0100 +++ /var/tmp/diff_new_pack.o0P33u/_new 2013-11-26 06:10:18.000000000 +0100 @@ -17,13 +17,15 @@ Name: itstool -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Tool to translate XML documents using PO files License: GPL-3.0+ Group: Development/Tools/Other Url: http://itstool.org Source: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM itstool-fix-crash.patch bgo#715116 [email protected] -- Fixed crash in locale filter and drop rule +Patch0: itstool-fix-crash.patch BuildRequires: libxml2-python Requires: libxml2-python BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,6 +39,7 @@ %prep %setup -q +%patch0 -p1 sed -i "s:#!/usr/bin/env python:#!/usr/bin/python:" itstool itstool.in %build ++++++ itstool-2.0.0.tar.bz2 -> itstool-2.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/ChangeLog new/itstool-2.0.1/ChangeLog --- old/itstool-2.0.0/ChangeLog 2013-11-01 18:40:46.000000000 +0100 +++ new/itstool-2.0.1/ChangeLog 2013-11-18 17:21:03.000000000 +0100 @@ -1,3 +1,35 @@ +commit b317a7c7362938098379f2f8db42f0f94d6f98dd +Author: Shaun McCance <[email protected]> +Date: Mon Nov 4 16:32:34 2013 -0500 + + its: Consolidate ITS rules for better performance + + its/docbook.its | 313 +++++++++++++++++++++++++++--------------------------- + its/docbook5.its | 310 ++++++++++++++++++++++++++--------------------------- + its/its.its | 3 +- + its/mallard.its | 25 ++--- + its/xhtml.its | 67 ++++++------ + 5 files changed, 355 insertions(+), 363 deletions(-) + +commit 3788e65a1fee2b141318b7bffc58d9dce8339d1a +Author: Shaun McCance <[email protected]> +Date: Fri Nov 1 13:48:41 2013 -0400 + + NEWS: Fixed typo + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit dd44edfb9486e4506accb520874d4e62422e1419 +Author: Shaun McCance <[email protected]> +Date: Fri Nov 1 13:43:35 2013 -0400 + + Version 2.0.0 + + NEWS | 19 +++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 20 insertions(+), 1 deletions(-) + commit 17a89300affeac556803c23eefefc9f279a82908 Author: Shaun McCance <[email protected]> Date: Fri Nov 1 11:53:28 2013 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/NEWS new/itstool-2.0.1/NEWS --- old/itstool-2.0.0/NEWS 2013-11-01 18:40:28.000000000 +0100 +++ new/itstool-2.0.1/NEWS 2013-11-18 17:20:44.000000000 +0100 @@ -1,3 +1,7 @@ +2.0.1 +===== +* Reworked default ITS rules for better performance + 2.0.0 ===== * Support for ITS 2.0 Preserve Space data category @@ -7,7 +11,7 @@ * Support for ITS 2.0 parameters, including user overrides * Support for ITS 2.0 local withinText attribute * Fixed handling of localization note inheritance -* Fixed handling od namespace prefixes on elements +* Fixed handling of namespace prefixes on elements * Added option to retain entity references in PO files * Added option to load external DTDs (Galen Charlton) * Added built-in rules for DocBook 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/configure new/itstool-2.0.1/configure --- old/itstool-2.0.0/configure 2013-11-01 18:40:44.000000000 +0100 +++ new/itstool-2.0.1/configure 2013-11-18 17:21:01.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for itstool 2.0.0. +# Generated by GNU Autoconf 2.66 for itstool 2.0.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -548,8 +548,8 @@ # Identity of this package. PACKAGE_NAME='itstool' PACKAGE_TARNAME='itstool' -PACKAGE_VERSION='2.0.0' -PACKAGE_STRING='itstool 2.0.0' +PACKAGE_VERSION='2.0.1' +PACKAGE_STRING='itstool 2.0.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1165,7 +1165,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures itstool 2.0.0 to adapt to many kinds of systems. +\`configure' configures itstool 2.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1231,7 +1231,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of itstool 2.0.0:";; + short | recursive ) echo "Configuration of itstool 2.0.1:";; esac cat <<\_ACEOF @@ -1298,7 +1298,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -itstool configure 2.0.0 +itstool configure 2.0.1 generated by GNU Autoconf 2.66 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1315,7 +1315,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by itstool $as_me 2.0.0, which was +It was created by itstool $as_me 2.0.1, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2130,7 +2130,7 @@ # Define the identity of the package. PACKAGE='itstool' - VERSION='2.0.0' + VERSION='2.0.1' cat >>confdefs.h <<_ACEOF @@ -2739,7 +2739,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by itstool $as_me 2.0.0, which was +This file was extended by itstool $as_me 2.0.1, which was generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2792,7 +2792,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -itstool config.status 2.0.0 +itstool config.status 2.0.1 configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/configure.ac new/itstool-2.0.1/configure.ac --- old/itstool-2.0.0/configure.ac 2013-11-01 18:40:34.000000000 +0100 +++ new/itstool-2.0.1/configure.ac 2013-11-18 17:20:49.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([itstool], [2.0.0], []) +AC_INIT([itstool], [2.0.1], []) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) DATADIR=`( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/its/docbook.its new/itstool-2.0.1/its/docbook.its --- old/itstool-2.0.0/its/docbook.its 2013-11-01 16:56:42.000000000 +0100 +++ new/itstool-2.0.1/its/docbook.its 2013-11-04 22:31:04.000000000 +0100 @@ -25,164 +25,161 @@ </itst:credits> <!-- Inline by default, might be overridden --> - <its:withinTextRule withinText="yes" selector="//abbrev"/> - <its:withinTextRule withinText="yes" selector="//accel"/> - <its:withinTextRule withinText="yes" selector="//acronym"/> - <its:withinTextRule withinText="yes" selector="//action"/> - <its:withinTextRule withinText="yes" selector="//affiliation"/> - <its:withinTextRule withinText="yes" selector="//anchor"/> - <its:withinTextRule withinText="yes" selector="//application"/> - <its:withinTextRule withinText="yes" selector="//arg"/> - <its:withinTextRule withinText="yes" selector="//audiodata"/> - <its:withinTextRule withinText="yes" selector="//audioobject"/> - <its:withinTextRule withinText="yes" selector="//authorinitials"/> - <its:withinTextRule withinText="yes" selector="//biblioref"/> - <its:withinTextRule withinText="yes" selector="//citation"/> - <its:withinTextRule withinText="yes" selector="//citebiblioid"/> - <its:withinTextRule withinText="yes" selector="//citerefentry"/> - <its:withinTextRule withinText="yes" selector="//citerefentry/manvolnum"/> - <its:withinTextRule withinText="yes" selector="//citerefentry/refentrytitle"/> - <its:withinTextRule withinText="yes" selector="//citetitle"/> - <its:withinTextRule withinText="yes" selector="//city"/> - <its:withinTextRule withinText="yes" selector="//classname"/> - <its:withinTextRule withinText="yes" selector="//co"/> - <its:withinTextRule withinText="yes" selector="//code"/> - <its:withinTextRule withinText="yes" selector="//col"/> - <its:withinTextRule withinText="yes" selector="//colgroup"/> - <its:withinTextRule withinText="yes" selector="//collabname"/> - <its:withinTextRule withinText="yes" selector="//command"/> - <its:withinTextRule withinText="yes" selector="//computeroutput"/> - <its:withinTextRule withinText="yes" selector="//constant"/> - <its:withinTextRule withinText="yes" selector="//constraint"/> - <its:withinTextRule withinText="yes" selector="//contrib"/> - <its:withinTextRule withinText="yes" selector="//country"/> - <its:withinTextRule withinText="yes" selector="//database"/> - <its:withinTextRule withinText="yes" selector="//date"/> - <its:withinTextRule withinText="yes" selector="//email"/> - <its:withinTextRule withinText="yes" selector="//emphasis"/> - <its:withinTextRule withinText="yes" selector="//envar"/> - <its:withinTextRule withinText="yes" selector="//errorcode"/> - <its:withinTextRule withinText="yes" selector="//errorname"/> - <its:withinTextRule withinText="yes" selector="//errortext"/> - <its:withinTextRule withinText="yes" selector="//errortype"/> - <its:withinTextRule withinText="yes" selector="//exceptionname"/> - <its:withinTextRule withinText="yes" selector="//fax"/> - <its:withinTextRule withinText="yes" selector="//filename"/> - <its:withinTextRule withinText="yes" selector="//firstname"/> - <its:withinTextRule withinText="yes" selector="//firstterm"/> - <its:withinTextRule withinText="yes" selector="//footnoteref"/> - <its:withinTextRule withinText="yes" selector="//foreignphrase"/> - <its:withinTextRule withinText="yes" selector="//funcdef"/> - <its:withinTextRule withinText="yes" selector="//funcparams"/> - <its:withinTextRule withinText="yes" selector="//function"/> - <its:withinTextRule withinText="yes" selector="//glossterm"/> - <its:withinTextRule withinText="yes" selector="//group"/> - <its:withinTextRule withinText="yes" selector="//guibutton"/> - <its:withinTextRule withinText="yes" selector="//guiicon"/> - <its:withinTextRule withinText="yes" selector="//guilabel"/> - <its:withinTextRule withinText="yes" selector="//guimenu"/> - <its:withinTextRule withinText="yes" selector="//guimenuitem"/> - <its:withinTextRule withinText="yes" selector="//guisubmenu"/> - <its:withinTextRule withinText="yes" selector="//hardware"/> - <its:withinTextRule withinText="yes" selector="//holder"/> - <its:withinTextRule withinText="yes" selector="//honorific"/> - <its:withinTextRule withinText="yes" selector="//imagedata"/> - <its:withinTextRule withinText="yes" selector="//imageobject"/> - <its:withinTextRule withinText="yes" selector="//imageobjectco"/> - <its:withinTextRule withinText="yes" selector="//initializer"/> - <its:withinTextRule withinText="yes" selector="//inlineequation"/> - <its:withinTextRule withinText="yes" selector="//inlinegraphic"/> - <its:withinTextRule withinText="yes" selector="//inlinemediaobject"/> - <its:withinTextRule withinText="yes" selector="//interface"/> - <its:withinTextRule withinText="yes" selector="//interfacename"/> - <its:withinTextRule withinText="yes" selector="//jobtitle"/> - <its:withinTextRule withinText="yes" selector="//keycap"/> - <its:withinTextRule withinText="yes" selector="//keycode"/> - <its:withinTextRule withinText="yes" selector="//keycombo"/> - <its:withinTextRule withinText="yes" selector="//keysym"/> - <its:withinTextRule withinText="yes" selector="//lhs"/> - <its:withinTextRule withinText="yes" selector="//lineage"/> - <its:withinTextRule withinText="yes" selector="//lineannotation"/> - <its:withinTextRule withinText="yes" selector="//link"/> - <its:withinTextRule withinText="yes" selector="//literal"/> - <its:withinTextRule withinText="yes" selector="//markup"/> - <its:withinTextRule withinText="yes" selector="//medialabel"/> - <its:withinTextRule withinText="yes" selector="//menuchoice"/> - <its:withinTextRule withinText="yes" selector="//methodname"/> - <its:withinTextRule withinText="yes" selector="//methodparam"/> - <its:withinTextRule withinText="yes" selector="//modifier"/> - <its:withinTextRule withinText="yes" selector="//mousebutton"/> - <its:withinTextRule withinText="yes" selector="//nonterminal"/> - <its:withinTextRule withinText="yes" selector="//olink"/> - <its:withinTextRule withinText="yes" selector="//ooclass"/> - <its:withinTextRule withinText="yes" selector="//ooexception"/> - <its:withinTextRule withinText="yes" selector="//oointerface"/> - <its:withinTextRule withinText="yes" selector="//option"/> - <its:withinTextRule withinText="yes" selector="//optional"/> - <its:withinTextRule withinText="yes" selector="//orgdiv"/> - <its:withinTextRule withinText="yes" selector="//orgname"/> - <its:withinTextRule withinText="yes" selector="//otheraddr"/> - <its:withinTextRule withinText="yes" selector="//othername"/> - <its:withinTextRule withinText="yes" selector="//package"/> - <its:withinTextRule withinText="yes" selector="//paramdef"/> - <its:withinTextRule withinText="yes" selector="//parameter"/> - <its:withinTextRule withinText="yes" selector="//personname"/> - <its:withinTextRule withinText="yes" selector="//phone"/> - <its:withinTextRule withinText="yes" selector="//phrase"/> - <its:withinTextRule withinText="yes" selector="//pob"/> - <its:withinTextRule withinText="yes" selector="//postcode"/> - <its:withinTextRule withinText="yes" selector="//productname"/> - <its:withinTextRule withinText="yes" selector="//productnumber"/> - <its:withinTextRule withinText="yes" selector="//prompt"/> - <its:withinTextRule withinText="yes" selector="//property"/> - <its:withinTextRule withinText="yes" selector="//quote"/> - <its:withinTextRule withinText="yes" selector="//replaceable"/> - <its:withinTextRule withinText="yes" selector="//returnvalue"/> - <its:withinTextRule withinText="yes" selector="//revnumber"/> - <its:withinTextRule withinText="yes" selector="//revremark"/> - <its:withinTextRule withinText="yes" selector="//rhs"/> - <its:withinTextRule withinText="yes" selector="//sbr"/> - <its:withinTextRule withinText="yes" selector="//sgmltag"/> - <its:withinTextRule withinText="yes" selector="//shortaffil"/> - <its:withinTextRule withinText="yes" selector="//shortcut"/> - <its:withinTextRule withinText="yes" selector="//state"/> - <its:withinTextRule withinText="yes" selector="//street"/> - <its:withinTextRule withinText="yes" selector="//structfield"/> - <its:withinTextRule withinText="yes" selector="//structname"/> - <its:withinTextRule withinText="yes" selector="//subscript"/> - <its:withinTextRule withinText="yes" selector="//superscript"/> - <its:withinTextRule withinText="yes" selector="//surname"/> - <its:withinTextRule withinText="yes" selector="//symbol"/> - <its:withinTextRule withinText="yes" selector="//systemitem"/> - <its:withinTextRule withinText="yes" selector="//termdef"/> - <its:withinTextRule withinText="yes" selector="//textobject"/> - <its:withinTextRule withinText="yes" selector="//token"/> - <its:withinTextRule withinText="yes" selector="//trademark"/> - <its:withinTextRule withinText="yes" selector="//type"/> - <its:withinTextRule withinText="yes" selector="//ulink"/> - <its:withinTextRule withinText="yes" selector="//uri"/> - <its:withinTextRule withinText="yes" selector="//userinput"/> - <its:withinTextRule withinText="yes" selector="//varargs"/> - <its:withinTextRule withinText="yes" selector="//varname"/> - <its:withinTextRule withinText="yes" selector="//videodata"/> - <its:withinTextRule withinText="yes" selector="//videoobject"/> - <its:withinTextRule withinText="yes" selector="//void"/> - <its:withinTextRule withinText="yes" selector="//wordasword"/> - <its:withinTextRule withinText="yes" selector="//xref"/> - <its:withinTextRule withinText="yes" selector="//year"/> + <its:withinTextRule withinText="yes" selector="//abbrev | + //accel | + //acronym | + //action | + //affiliation | + //anchor | + //application | + //arg | + //audiodata | + //audioobject | + //authorinitials | + //biblioref | + //citation | + //citebiblioid | + //citerefentry | + //citerefentry/manvolnum | + //citerefentry/refentrytitle | + //citetitle | + //city | + //classname | + //co | + //code | + //col | + //colgroup | + //collabname | + //command | + //computeroutput | + //constant | + //constraint | + //contrib | + //country | + //database | + //date | + //email | + //emphasis | + //envar | + //errorcode | + //errorname | + //errortext | + //errortype | + //exceptionname | + //fax | + //filename | + //firstname | + //firstterm | + //footnoteref | + //foreignphrase | + //funcdef | + //funcparams | + //function | + //glossterm | + //group | + //guibutton | + //guiicon | + //guilabel | + //guimenu | + //guimenuitem | + //guisubmenu | + //hardware | + //holder | + //honorific | + //imagedata | + //imageobject | + //imageobjectco | + //initializer | + //inlineequation | + //inlinegraphic | + //inlinemediaobject | + //interface | + //interfacename | + //jobtitle | + //keycap | + //keycode | + //keycombo | + //keysym | + //lhs | + //lineage | + //lineannotation | + //link | + //literal | + //markup | + //medialabel | + //menuchoice | + //methodname | + //methodparam | + //modifier | + //mousebutton | + //nonterminal | + //olink | + //ooclass | + //ooexception | + //oointerface | + //option | + //optional | + //orgdiv | + //orgname | + //otheraddr | + //othername | + //package | + //paramdef | + //parameter | + //personname | + //phone | + //phrase | + //pob | + //postcode | + //productname | + //productnumber | + //prompt | + //property | + //quote | + //replaceable | + //returnvalue | + //revnumber | + //revremark | + //rhs | + //sbr | + //sgmltag | + //shortaffil | + //shortcut | + //state | + //street | + //structfield | + //structname | + //subscript | + //superscript | + //surname | + //symbol | + //systemitem | + //termdef | + //textobject | + //token | + //trademark | + //type | + //ulink | + //uri | + //userinput | + //varargs | + //varname | + //videodata | + //videoobject | + //void | + //wordasword | + //xref | + //year "/> <!-- Mark footnotes nested, though itstool treats it as "no" --> <its:withinTextRule withinText="nested" selector="//footnote"/> <!-- Things with (semi-)structured content --> - <its:withinTextRule withinText="no" selector="//confgroup/*"/> - <its:withinTextRule withinText="no" selector="//biblioentry/*"/> - <its:withinTextRule withinText="no" selector="//biblioset/*"/> - <its:withinTextRule withinText="yes" selector="//bibliomixed/*"/> - <its:withinTextRule withinText="yes" selector="//bibliomset/*"/> + <its:withinTextRule withinText="no" selector="//confgroup/* | //biblioentry/* | //biblioset/*"/> + <its:withinTextRule withinText="yes" selector="//bibliomixed/* | //bibliomset/*"/> <its:withinTextRule withinText="no" selector="//glossentry/*"/> - <its:withinTextRule withinText="yes" selector="//indexterm//*"/> - <its:withinTextRule withinText="yes" selector="//simplelist[@type = 'inline']/descendant-or-self::*"/> + <its:withinTextRule withinText="yes" selector="//indexterm//* | + //simplelist[@type = 'inline']/descendant-or-self::*"/> <!-- We want to break address off into a translation unit because it's @@ -198,12 +195,12 @@ <its:withinTextRule withinText="no" selector="//bookinfo/* | //chapterinfo/* | //articleinfo/*"/> <!-- These are always verbatim --> - <its:preserveSpaceRule space="preserve" selector="//classsynopsisinfo"/> - <its:preserveSpaceRule space="preserve" selector="//funcsynopsisinfo"/> - <its:preserveSpaceRule space="preserve" selector="//literallayout"/> - <its:preserveSpaceRule space="preserve" selector="//programlisting"/> - <its:preserveSpaceRule space="preserve" selector="//screen"/> - <its:preserveSpaceRule space="preserve" selector="//synopsis"/> + <its:preserveSpaceRule space="preserve" selector="//classsynopsisinfo | + //funcsynopsisinfo | + //literallayout | + //programlisting | + //screen | + //synopsis "/> <!-- Drop editor remarks --> <its:localeFilterRule localeFilterList="" selector="//remark"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/its/docbook5.its new/itstool-2.0.1/its/docbook5.its --- old/itstool-2.0.0/its/docbook5.its 2013-11-01 16:56:42.000000000 +0100 +++ new/itstool-2.0.1/its/docbook5.its 2013-11-04 22:31:15.000000000 +0100 @@ -24,173 +24,171 @@ </itst:credits> <!-- Inline by default, might be overridden --> - <its:withinTextRule withinText="yes" selector="//db:abbrev"/> - <its:withinTextRule withinText="yes" selector="//db:accel"/> - <its:withinTextRule withinText="yes" selector="//db:acronym"/> - <its:withinTextRule withinText="yes" selector="//db:affiliation"/> - <its:withinTextRule withinText="yes" selector="//db:alt"/> - <its:withinTextRule withinText="yes" selector="//db:anchor"/> - <its:withinTextRule withinText="yes" selector="//db:application"/> - <its:withinTextRule withinText="yes" selector="//db:arg"/> - <its:withinTextRule withinText="yes" selector="//db:audiodata"/> - <its:withinTextRule withinText="yes" selector="//db:audioobject"/> - <its:withinTextRule withinText="yes" selector="//db:authorinitials"/> - <its:withinTextRule withinText="yes" selector="//db:biblioref"/> - <its:withinTextRule withinText="yes" selector="//db:citation"/> - <its:withinTextRule withinText="yes" selector="//db:citebiblioid"/> - <its:withinTextRule withinText="yes" selector="//db:citerefentry"/> - <its:withinTextRule withinText="yes" selector="//db:citerefentry/db:manvolnum"/> - <its:withinTextRule withinText="yes" selector="//db:citerefentry/db:refentrytitle"/> - <its:withinTextRule withinText="yes" selector="//db:citetitle"/> - <its:withinTextRule withinText="yes" selector="//db:city"/> - <its:withinTextRule withinText="yes" selector="//db:classname"/> - <its:withinTextRule withinText="yes" selector="//db:co"/> - <its:withinTextRule withinText="yes" selector="//db:coref"/> - <its:withinTextRule withinText="yes" selector="//db:code"/> - <its:withinTextRule withinText="yes" selector="//db:col"/> - <its:withinTextRule withinText="yes" selector="//db:colgroup"/> - <its:withinTextRule withinText="yes" selector="//db:command"/> - <its:withinTextRule withinText="yes" selector="//db:computeroutput"/> - <its:withinTextRule withinText="yes" selector="//db:constant"/> - <its:withinTextRule withinText="yes" selector="//db:constraint"/> - <its:withinTextRule withinText="yes" selector="//db:contrib"/> - <its:withinTextRule withinText="yes" selector="//db:country"/> - <its:withinTextRule withinText="yes" selector="//db:database"/> - <its:withinTextRule withinText="yes" selector="//db:date"/> - <its:withinTextRule withinText="yes" selector="//db:email"/> - <its:withinTextRule withinText="yes" selector="//db:emphasis"/> - <its:withinTextRule withinText="yes" selector="//db:envar"/> - <its:withinTextRule withinText="yes" selector="//db:errorcode"/> - <its:withinTextRule withinText="yes" selector="//db:errorname"/> - <its:withinTextRule withinText="yes" selector="//db:errortext"/> - <its:withinTextRule withinText="yes" selector="//db:errortype"/> - <its:withinTextRule withinText="yes" selector="//db:exceptionname"/> - <its:withinTextRule withinText="yes" selector="//db:fax"/> - <its:withinTextRule withinText="yes" selector="//db:filename"/> - <its:withinTextRule withinText="yes" selector="//db:firstname"/> - <its:withinTextRule withinText="yes" selector="//db:firstterm"/> - <its:withinTextRule withinText="yes" selector="//db:footnoteref"/> - <its:withinTextRule withinText="yes" selector="//db:foreignphrase"/> - <its:withinTextRule withinText="yes" selector="//db:funcdef"/> - <its:withinTextRule withinText="yes" selector="//db:funcparams"/> - <its:withinTextRule withinText="yes" selector="//db:function"/> - <its:withinTextRule withinText="yes" selector="//db:givenname"/> - <its:withinTextRule withinText="yes" selector="//db:glossterm"/> - <its:withinTextRule withinText="yes" selector="//db:group"/> - <its:withinTextRule withinText="yes" selector="//db:guibutton"/> - <its:withinTextRule withinText="yes" selector="//db:guiicon"/> - <its:withinTextRule withinText="yes" selector="//db:guilabel"/> - <its:withinTextRule withinText="yes" selector="//db:guimenu"/> - <its:withinTextRule withinText="yes" selector="//db:guimenuitem"/> - <its:withinTextRule withinText="yes" selector="//db:guisubmenu"/> - <its:withinTextRule withinText="yes" selector="//db:hardware"/> - <its:withinTextRule withinText="yes" selector="//db:holder"/> - <its:withinTextRule withinText="yes" selector="//db:honorific"/> - <its:withinTextRule withinText="yes" selector="//db:imagedata"/> - <its:withinTextRule withinText="yes" selector="//db:imageobject"/> - <its:withinTextRule withinText="yes" selector="//db:imageobjectco"/> - <its:withinTextRule withinText="yes" selector="//db:initializer"/> - <its:withinTextRule withinText="yes" selector="//db:inlineequation"/> - <its:withinTextRule withinText="yes" selector="//db:inlinemediaobject"/> - <its:withinTextRule withinText="yes" selector="//db:interfacename"/> - <its:withinTextRule withinText="yes" selector="//db:jobtitle"/> - <its:withinTextRule withinText="yes" selector="//db:keycap"/> - <its:withinTextRule withinText="yes" selector="//db:keycode"/> - <its:withinTextRule withinText="yes" selector="//db:keycombo"/> - <its:withinTextRule withinText="yes" selector="//db:keysym"/> - <its:withinTextRule withinText="yes" selector="//db:lhs"/> - <its:withinTextRule withinText="yes" selector="//db:lineage"/> - <its:withinTextRule withinText="yes" selector="//db:lineannotation"/> - <its:withinTextRule withinText="yes" selector="//db:link"/> - <its:withinTextRule withinText="yes" selector="//db:literal"/> - <its:withinTextRule withinText="yes" selector="//db:markup"/> - <its:withinTextRule withinText="yes" selector="//db:menuchoice"/> - <its:withinTextRule withinText="yes" selector="//db:methodname"/> - <its:withinTextRule withinText="yes" selector="//db:methodparam"/> - <its:withinTextRule withinText="yes" selector="//db:modifier"/> - <its:withinTextRule withinText="yes" selector="//db:mousebutton"/> - <its:withinTextRule withinText="yes" selector="//db:multimediaparam"/> - <its:withinTextRule withinText="yes" selector="//db:nonterminal"/> - <its:withinTextRule withinText="yes" selector="//db:olink"/> - <its:withinTextRule withinText="yes" selector="//db:ooclass"/> - <its:withinTextRule withinText="yes" selector="//db:ooexception"/> - <its:withinTextRule withinText="yes" selector="//db:oointerface"/> - <its:withinTextRule withinText="yes" selector="//db:option"/> - <its:withinTextRule withinText="yes" selector="//db:optional"/> - <its:withinTextRule withinText="yes" selector="//db:org"/> - <its:withinTextRule withinText="yes" selector="//db:orgdiv"/> - <its:withinTextRule withinText="yes" selector="//db:orgname"/> - <its:withinTextRule withinText="yes" selector="//db:otheraddr"/> - <its:withinTextRule withinText="yes" selector="//db:othername"/> - <its:withinTextRule withinText="yes" selector="//db:package"/> - <its:withinTextRule withinText="yes" selector="//db:paramdef"/> - <its:withinTextRule withinText="yes" selector="//db:parameter"/> - <its:withinTextRule withinText="yes" selector="//db:personname"/> - <its:withinTextRule withinText="yes" selector="//db:phone"/> - <its:withinTextRule withinText="yes" selector="//db:phrase"/> - <its:withinTextRule withinText="yes" selector="//db:pob"/> - <its:withinTextRule withinText="yes" selector="//db:postcode"/> - <its:withinTextRule withinText="yes" selector="//db:productname"/> - <its:withinTextRule withinText="yes" selector="//db:productnumber"/> - <its:withinTextRule withinText="yes" selector="//db:prompt"/> - <its:withinTextRule withinText="yes" selector="//db:property"/> - <its:withinTextRule withinText="yes" selector="//db:quote"/> - <its:withinTextRule withinText="yes" selector="//db:replaceable"/> - <its:withinTextRule withinText="yes" selector="//db:returnvalue"/> - <its:withinTextRule withinText="yes" selector="//db:revnumber"/> - <its:withinTextRule withinText="yes" selector="//db:revremark"/> - <its:withinTextRule withinText="yes" selector="//db:rhs"/> - <its:withinTextRule withinText="yes" selector="//db:sbr"/> - <its:withinTextRule withinText="yes" selector="//db:shortaffil"/> - <its:withinTextRule withinText="yes" selector="//db:shortcut"/> - <its:withinTextRule withinText="yes" selector="//db:state"/> - <its:withinTextRule withinText="yes" selector="//db:street"/> - <its:withinTextRule withinText="yes" selector="//db:subscript"/> - <its:withinTextRule withinText="yes" selector="//db:superscript"/> - <its:withinTextRule withinText="yes" selector="//db:surname"/> - <its:withinTextRule withinText="yes" selector="//db:symbol"/> - <its:withinTextRule withinText="yes" selector="//db:systemitem"/> - <its:withinTextRule withinText="yes" selector="//db:tag"/> - <its:withinTextRule withinText="yes" selector="//db:termdef"/> - <its:withinTextRule withinText="yes" selector="//db:textobject"/> - <its:withinTextRule withinText="yes" selector="//db:token"/> - <its:withinTextRule withinText="yes" selector="//db:trademark"/> - <its:withinTextRule withinText="yes" selector="//db:type"/> - <its:withinTextRule withinText="yes" selector="//db:uri"/> - <its:withinTextRule withinText="yes" selector="//db:userinput"/> - <its:withinTextRule withinText="yes" selector="//db:varargs"/> - <its:withinTextRule withinText="yes" selector="//db:varname"/> - <its:withinTextRule withinText="yes" selector="//db:videodata"/> - <its:withinTextRule withinText="yes" selector="//db:videoobject"/> - <its:withinTextRule withinText="yes" selector="//db:void"/> - <its:withinTextRule withinText="yes" selector="//db:wordasword"/> - <its:withinTextRule withinText="yes" selector="//db:xref"/> - <its:withinTextRule withinText="yes" selector="//db:year"/> + <its:withinTextRule withinText="yes" + selector="//db:abbrev | + //db:accel | + //db:acronym | + //db:affiliation | + //db:alt | + //db:anchor | + //db:application | + //db:arg | + //db:audiodata | + //db:audioobject | + //db:authorinitials | + //db:biblioref | + //db:citation | + //db:citebiblioid | + //db:citerefentry | + //db:citerefentry/db:manvolnum | + //db:citerefentry/db:refentrytitle | + //db:citetitle | + //db:city | + //db:classname | + //db:co | + //db:coref | + //db:code | + //db:col | + //db:colgroup | + //db:command | + //db:computeroutput | + //db:constant | + //db:constraint | + //db:contrib | + //db:country | + //db:database | + //db:date | + //db:email | + //db:emphasis | + //db:envar | + //db:errorcode | + //db:errorname | + //db:errortext | + //db:errortype | + //db:exceptionname | + //db:fax | + //db:filename | + //db:firstname | + //db:firstterm | + //db:footnoteref | + //db:foreignphrase | + //db:funcdef | + //db:funcparams | + //db:function | + //db:givenname | + //db:glossterm | + //db:group | + //db:guibutton | + //db:guiicon | + //db:guilabel | + //db:guimenu | + //db:guimenuitem | + //db:guisubmenu | + //db:hardware | + //db:holder | + //db:honorific | + //db:imagedata | + //db:imageobject | + //db:imageobjectco | + //db:initializer | + //db:inlineequation | + //db:inlinemediaobject | + //db:interfacename | + //db:jobtitle | + //db:keycap | + //db:keycode | + //db:keycombo | + //db:keysym | + //db:lhs | + //db:lineage | + //db:lineannotation | + //db:link | + //db:literal | + //db:markup | + //db:menuchoice | + //db:methodname | + //db:methodparam | + //db:modifier | + //db:mousebutton | + //db:multimediaparam | + //db:nonterminal | + //db:olink | + //db:ooclass | + //db:ooexception | + //db:oointerface | + //db:option | + //db:optional | + //db:org | + //db:orgdiv | + //db:orgname | + //db:otheraddr | + //db:othername | + //db:package | + //db:paramdef | + //db:parameter | + //db:personname | + //db:phone | + //db:phrase | + //db:pob | + //db:postcode | + //db:productname | + //db:productnumber | + //db:prompt | + //db:property | + //db:quote | + //db:replaceable | + //db:returnvalue | + //db:revnumber | + //db:revremark | + //db:rhs | + //db:sbr | + //db:shortaffil | + //db:shortcut | + //db:state | + //db:street | + //db:subscript | + //db:superscript | + //db:surname | + //db:symbol | + //db:systemitem | + //db:tag | + //db:termdef | + //db:textobject | + //db:token | + //db:trademark | + //db:type | + //db:uri | + //db:userinput | + //db:varargs | + //db:varname | + //db:videodata | + //db:videoobject | + //db:void | + //db:wordasword | + //db:xref | + //db:year "/> <!-- Mark footnotes nested, though itstool treats it as "no" --> <its:withinTextRule withinText="nested" selector="//db:footnote"/> <!-- Things with (semi-)structured content --> - <its:withinTextRule withinText="no" selector="//db:confgroup/*"/> - <its:withinTextRule withinText="no" selector="//db:biblioentry/*"/> - <its:withinTextRule withinText="no" selector="//db:biblioset/*"/> - <its:withinTextRule withinText="yes" selector="//db:bibliomixed/*"/> - <its:withinTextRule withinText="yes" selector="//db:bibliomset/*"/> + <its:withinTextRule withinText="no" selector="//db:confgroup/* | //db:biblioentry/* | db:biblioset/*"/> + <its:withinTextRule withinText="yes" selector="//db:bibliomixed/* | //db:bibliomset/*"/> <its:withinTextRule withinText="no" selector="//db:glossentry/*"/> - <its:withinTextRule withinText="yes" selector="//db:indexterm//*"/> - <its:withinTextRule withinText="yes" selector="//db:simplelist[@type = 'inline']/descendant-or-self::*"/> + <its:withinTextRule withinText="yes" selector="//db:indexterm//* | + //db:simplelist[@type = 'inline']/descendant-or-self::*"/> <!-- Above all else, info is not a text run --> <its:withinTextRule withinText="no" selector="//db:info/*"/> <!-- These are always verbatim --> - <its:preserveSpaceRule space="preserve" selector="//db:address"/> - <its:preserveSpaceRule space="preserve" selector="//db:classsynopsisinfo"/> - <its:preserveSpaceRule space="preserve" selector="//db:funcsynopsisinfo"/> - <its:preserveSpaceRule space="preserve" selector="//db:literallayout"/> - <its:preserveSpaceRule space="preserve" selector="//db:programlisting"/> - <its:preserveSpaceRule space="preserve" selector="//db:screen"/> - <its:preserveSpaceRule space="preserve" selector="//db:synopsis"/> + <its:preserveSpaceRule space="preserve" selector="//db:address | + //db:classsynopsisinfo | + //db:funcsynopsisinfo | + //db:literallayout | + //db:programlisting | + //db:screen | + //db:synopsis "/> <!-- Drop editor remarks --> <its:localeFilterRule localeFilterList="" selector="//db:remark"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/its/its.its new/itstool-2.0.1/its/its.its --- old/itstool-2.0.0/its/its.its 2013-11-01 16:56:42.000000000 +0100 +++ new/itstool-2.0.1/its/its.its 2013-11-04 22:29:36.000000000 +0100 @@ -1,6 +1,5 @@ <its:rules xmlns:its="http://www.w3.org/2005/11/its"; version="2.0"> - <its:translateRule translate="no" selector="//its:param"/> - <its:translateRule translate="no" selector="//its:locNote"/> + <its:translateRule translate="no" selector="//its:param | //its:locNote"/> </its:rules> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/its/mallard.its new/itstool-2.0.1/its/mallard.its --- old/itstool-2.0.0/its/mallard.its 2013-11-01 16:56:42.000000000 +0100 +++ new/itstool-2.0.1/its/mallard.its 2013-11-04 22:32:08.000000000 +0100 @@ -18,19 +18,18 @@ </mal:credit> </itst:credits> - <its:withinTextRule withinText="yes" selector="//mal:cite//*"/> - <its:withinTextRule withinText="yes" selector="//mal:code//*"/> - <its:withinTextRule withinText="yes" selector="//mal:desc//*"/> - <its:withinTextRule withinText="yes" selector="//mal:email//*"/> - <its:withinTextRule withinText="yes" selector="//mal:link//*"/> - <its:withinTextRule withinText="yes" selector="//mal:name//*"/> - <its:withinTextRule withinText="yes" selector="//mal:p//*"/> - <its:withinTextRule withinText="yes" selector="//mal:screen//*"/> - <its:withinTextRule withinText="yes" selector="//mal:title//*"/> - <its:withinTextRule withinText="yes" selector="//mal:years//*"/> + <its:withinTextRule withinText="yes" selector="//mal:cite//* | + //mal:code//* | + //mal:desc//* | + //mal:email//* | + //mal:link//* | + //mal:name//* | + //mal:p//* | + //mal:screen//* | + //mal:title//* | + //mal:years//* "/> - <its:preserveSpaceRule space="preserve" selector="//mal:code"/> - <its:preserveSpaceRule space="preserve" selector="//mal:screen"/> + <its:preserveSpaceRule space="preserve" selector="//mal:code | //mal:screen "/> <its:localeFilterRule localeFilterList="" selector="//mal:comment"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/its/xhtml.its new/itstool-2.0.1/its/xhtml.its --- old/itstool-2.0.0/its/xhtml.its 2013-11-01 16:56:42.000000000 +0100 +++ new/itstool-2.0.1/its/xhtml.its 2013-11-04 22:30:19.000000000 +0100 @@ -6,43 +6,42 @@ <itst:match selector="/html:html"/> - <its:translateRule translate="no" selector="//html:script"/> - <its:translateRule translate="no" selector="//html:style"/> + <its:translateRule translate="no" selector="//html:script | //html:style"/> <its:preserveSpaceRule space="preserve" selector="//html:pre"/> - <its:withinTextRule withinText="yes" selector="//html:a"/> - <its:withinTextRule withinText="yes" selector="//html:abbr"/> - <its:withinTextRule withinText="yes" selector="//html:acronym"/> - <its:withinTextRule withinText="yes" selector="//html:b"/> - <its:withinTextRule withinText="yes" selector="//html:bdo"/> - <its:withinTextRule withinText="yes" selector="//html:big"/> - <its:withinTextRule withinText="yes" selector="//html:br"/> - <its:withinTextRule withinText="yes" selector="//html:center"/> - <its:withinTextRule withinText="yes" selector="//html:cite"/> - <its:withinTextRule withinText="yes" selector="//html:code"/> - <its:withinTextRule withinText="yes" selector="//html:del"/> - <its:withinTextRule withinText="yes" selector="//html:dfn"/> - <its:withinTextRule withinText="yes" selector="//html:em"/> - <its:withinTextRule withinText="yes" selector="//html:font"/> - <its:withinTextRule withinText="yes" selector="//html:hr"/> - <its:withinTextRule withinText="yes" selector="//html:i"/> - <its:withinTextRule withinText="yes" selector="//html:img"/> - <its:withinTextRule withinText="yes" selector="//html:ins"/> - <its:withinTextRule withinText="yes" selector="//html:isindex"/> - <its:withinTextRule withinText="yes" selector="//html:kbd"/> - <its:withinTextRule withinText="yes" selector="//html:q"/> - <its:withinTextRule withinText="yes" selector="//html:s"/> - <its:withinTextRule withinText="yes" selector="//html:samp"/> - <its:withinTextRule withinText="yes" selector="//html:small"/> - <its:withinTextRule withinText="yes" selector="//html:span"/> - <its:withinTextRule withinText="yes" selector="//html:strike"/> - <its:withinTextRule withinText="yes" selector="//html:strong"/> - <its:withinTextRule withinText="yes" selector="//html:sub"/> - <its:withinTextRule withinText="yes" selector="//html:sup"/> - <its:withinTextRule withinText="yes" selector="//html:tt"/> - <its:withinTextRule withinText="yes" selector="//html:u"/> - <its:withinTextRule withinText="yes" selector="//html:var"/> + <its:withinTextRule withinText="yes" selector="//html:a | + //html:abbr | + //html:acronym | + //html:b | + //html:bdo | + //html:big | + //html:br | + //html:center | + //html:cite | + //html:code | + //html:del | + //html:dfn | + //html:em | + //html:font | + //html:hr | + //html:i | + //html:img | + //html:ins | + //html:isindex | + //html:kbd | + //html:q | + //html:s | + //html:samp | + //html:small | + //html:span | + //html:strike | + //html:strong | + //html:sub | + //html:sup | + //html:tt | + //html:u | + //html:var "/> <its:externalResourceRefRule externalResourceRefPointer="@src" selector="//html:img | //html:audio | //html:video"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/itstool new/itstool-2.0.1/itstool --- old/itstool-2.0.0/itstool 2013-11-01 18:40:46.000000000 +0100 +++ new/itstool-2.0.1/itstool 2013-11-18 17:21:03.000000000 +0100 @@ -17,7 +17,7 @@ # Place, Suite 330, Boston, MA 0211-1307 USA. # -VERSION="2.0.0" +VERSION="2.0.1" DATADIR="/usr/local/share" import gettext diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.0/itstool.1 new/itstool-2.0.1/itstool.1 --- old/itstool-2.0.0/itstool.1 2013-11-01 18:40:46.000000000 +0100 +++ new/itstool-2.0.1/itstool.1 2013-11-18 17:21:03.000000000 +0100 @@ -1,4 +1,4 @@ -.TH ITSTOOL "1" "May 2011" "itstool 2.0.0" +.TH ITSTOOL "1" "May 2011" "itstool 2.0.1" .SH NAME itstool \- convert between XML and PO using ITS ++++++ itstool-fix-crash.patch ++++++ >From 46067ed60cbe1e5e3efe176da1f40f8219336490 Mon Sep 17 00:00:00 2001 From: Shaun McCance <[email protected]> Date: Sun, 24 Nov 2013 14:10:03 -0500 Subject: [PATCH] Fixed crash in locale filter and drop rule, #715116 When the dropped node has no preceding sibling, itstool crashes because it tries to unlink prev node if it's blank. --- itstool.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/itstool.in b/itstool.in index 150b395..a04ab2b 100755 --- a/itstool.in +++ b/itstool.in @@ -859,7 +859,7 @@ class Document (object): prev = node.prev node.unlinkNode() node.freeNode() - if prev.isBlankNode(): + if prev is not None and prev.isBlankNode(): prev.unlinkNode() prev.freeNode() return @@ -914,7 +914,7 @@ class Document (object): prev = node.prev node.unlinkNode() node.freeNode() - if prev.isBlankNode(): + if prev is not None and prev.isBlankNode(): prev.unlinkNode() prev.freeNode() return -- 1.7.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
