commit xmlstarlet for openSUSE:Factory
Hello community,
here is the log from the commit of package xmlstarlet for openSUSE:Factory checked in at 2012-12-28 22:51:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlstarlet (Old)
and /work/SRC/openSUSE:Factory/.xmlstarlet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlstarlet", Maintainer is "Thomas.Schraitle@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlstarlet/xmlstarlet.changes 2012-10-26 17:37:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xmlstarlet.new/xmlstarlet.changes 2012-12-28 22:51:29.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Dec 16 02:32:36 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.4.1:
+ * avoid segfault when attempting to edit the document node
+
+-------------------------------------------------------------------
Old:
----
xmlstarlet-1.4.0.tar.gz
New:
----
xmlstarlet-1.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlstarlet.spec ++++++
--- /var/tmp/diff_new_pack.c4vHkY/_old 2012-12-28 22:51:30.000000000 +0100
+++ /var/tmp/diff_new_pack.c4vHkY/_new 2012-12-28 22:51:30.000000000 +0100
@@ -29,7 +29,7 @@
Summary: Command Line Tool to Process XML Documents
License: MIT
Group: Productivity/Publishing/XML
-Version: 1.4.0
+Version: 1.4.1
Release: 0
Source: http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz
Source1: %{name}-rpmlintrc
++++++ xmlstarlet-1.4.0.tar.gz -> xmlstarlet-1.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/Makefile.am new/xmlstarlet-1.4.1/Makefile.am
--- old/xmlstarlet-1.4.0/Makefile.am 2012-08-26 16:31:10.000000000 +0200
+++ new/xmlstarlet-1.4.1/Makefile.am 2012-12-08 21:50:46.000000000 +0100
@@ -9,7 +9,11 @@
GIT_DESCRIBE = git describe --tags --dirty
+# TODO: figure out why log removal is needed and/or make it completely automatic
dist-hook:
+ @for log in $(srcdir)/examples/*.log ; do if [ -f "$$log" ] ; then \
+ rm $(srcdir)/examples/*.log ; \
+ echo 'ERROR: log files need to cleaned BEFORE making tarball, try again'; exit 1 ; fi ; done
@ if [ -d .git ] ; then \
if [ $(VERSION) != `$(GIT_DESCRIBE)` ] ; then \
echo 'ERROR: version mismatch, rerun autoconf -f' ; exit 1 ; fi ; \
@@ -74,7 +78,7 @@
man_MANS = $(manpage)
dist_doc_DATA = $(userguide_gen) doc/html.css $(txtguide)
EXTRA_DIST += $(manpage_src) $(userguide_src) $(txtguide_src)
-EXTRA_DIST += doc/replace-PROG-VERSION.xsl $(manpage)
+EXTRA_DIST += $(buildfiles_docs) $(manpage)
CLEANFILES = version.h $(generated_usage_sources)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/Makefile.in new/xmlstarlet-1.4.1/Makefile.in
--- old/xmlstarlet-1.4.0/Makefile.in 2012-08-26 16:32:03.000000000 +0200
+++ new/xmlstarlet-1.4.1/Makefile.in 2012-12-08 21:51:07.000000000 +0100
@@ -175,6 +175,91 @@
blu='[1;34m'; \
std='[m'; \
}
+# Restructured Text title and section.
+am__rst_title = sed 's/.*/ & /;h;s/./=/g;p;x;p;g;p;s/.*//'
+am__rst_section = sed 'p;s/./=/g;p;g'
+# Put stdin (possibly several lines separated by ". ") in a box.
+# Prefix each line by 'col' and terminate each with 'std', for coloring.
+# Multi line coloring is problematic with "less -R", so we really need
+# to color each line individually.
+am__text_box = $(AWK) '{ \
+ n = split($$0, lines, "\\. "); max = 0; \
+ for (i = 1; i <= n; ++i) \
+ if (max < length(lines[i])) \
+ max = length(lines[i]); \
+ for (i = 0; i < max; ++i) \
+ line = line "="; \
+ print col line std; \
+ for (i = 1; i <= n; ++i) \
+ if (lines[i]) \
+ print col lines[i] std; \
+ print col line std; \
+}'
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# To be inserted before the command running the test. Creates the
+# directory for the log if needed. Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log, and passes
+# TESTS_ENVIRONMENT. Save and restore TERM around use of
+# TESTS_ENVIRONMENT, in case that unsets it.
+am__check_pre = \
+$(am__sh_e_setup); \
+$(am__vpath_adj_setup) $(am__vpath_adj) \
+srcdir=$(srcdir); export srcdir; \
+rm -f $@-t; \
+am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2; \
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
+am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`; \
+test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?; \
+if test -f "./$$f"; then dir=./; \
+elif test -f "$$f"; then dir=; \
+else dir="$(srcdir)/"; fi; \
+tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM; \
+$(TESTS_ENVIRONMENT)
+# To be appended to the command running the test. Handle the stdout
+# and stderr redirection, and catch the exit status.
+am__check_post = \
+>$@-t 2>&1; \
+estatus=$$?; \
+if test -n '$(DISABLE_HARD_ERRORS)' \
+ && test $$estatus -eq 99; then \
+ estatus=1; \
+fi; \
+TERM=$$__SAVED_TERM; export TERM; \
+$(am__tty_colors); \
+xfailed=PASS; \
+case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
+ xfailed=XFAIL;; \
+esac; \
+case $$estatus.$$xfailed in \
+ 0.XFAIL) col=$$red; res=XPASS;; \
+ 0.*) col=$$grn; res=PASS ;; \
+ 77.*) col=$$blu; res=SKIP ;; \
+ 99.*) col=$$red; res=FAIL ;; \
+ *.XFAIL) col=$$lgn; res=XFAIL;; \
+ *.*) col=$$red; res=FAIL ;; \
+esac; \
+echo "$${col}$$res$${std}: $$f"; \
+echo "$$res: $$f (exit: $$estatus)" | \
+ $(am__rst_section) >$@; \
+cat $@-t >>$@; \
+rm -f $@-t
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck check-html recheck-html
+TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+ $(TEST_LOG_FLAGS)
+TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -234,8 +319,11 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PDF2PS = @PDF2PS@
SED = @SED@
@@ -302,14 +390,15 @@
top_srcdir = @top_srcdir@
EXTRA_DIST = Copyright examples solaris tests $(usage_texts) \
usage2c.awk $(manpage_src) $(userguide_src) $(txtguide_src) \
- doc/replace-PROG-VERSION.xsl $(manpage)
+ $(buildfiles_docs) $(manpage)
WIN32_DIST = README TODO Copyright COPYING AUTHORS ChangeLog INSTALL NEWS xml.exe
WIN32_doc_DIST = $(generated_docs) doc/html.css
ACLOCAL_AMFLAGS = -I m4
@GCC_TRUE@AM_CFLAGS = -Wall -pedantic
GIT_DESCRIBE = git describe --tags --dirty
-TESTS_ENVIRONMENT = abs_builddir=$(abs_builddir) EXEEXT=$(EXEEXT) SED=$(SED) \
- $(srcdir)/tests/runTest.sh
+LOG_COMPILER = abs_builddir=$(abs_builddir) \
+EXEEXT=$(EXEEXT) SED=$(SED) AWK=$(AWK) SHELL=$(SHELL) \
+ $(SHELL) $(srcdir)/tests/runTest.sh
# split tests into fast and slow, so we can run just the fast ones
@@ -445,6 +534,7 @@
manpage = doc/xmlstarlet.1
manpage_src = doc/xmlstarlet-man.xml
generated_docs = $(userguide_gen) $(txtguide) $(manpage)
+buildfiles_docs = doc/replace-PROG-VERSION.xsl doc/xmlstar-fodoc-style.xsl
DOCBOOK_PARAMS = \
--param section.autolabel 1 \
--stringparam generate.toc 'book toc,title'
@@ -464,7 +554,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .c .fo .html .o .obj .pdf .ps .txt .xml
+.SUFFIXES: .c .fo .html .log .o .obj .pdf .ps .test .test$(EXEEXT) .txt .xml
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/examples/tests.mk $(srcdir)/src/sources.mk $(srcdir)/doc/doc.mk $(am__configure_deps)
@@ -827,98 +917,294 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- $(am__tty_colors); \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
- ;; \
- *) \
- col=$$grn; res=PASS; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
- fi; \
- echo "$${col}$$res$${std}: $$tst"; \
- done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
- else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
- else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+ @$(am__sh_e_setup); \
+ list='$(TEST_LOGS)'; \
+ results=`for f in $$list; do \
+ test -r $$f && read line < $$f && echo "$$line" \
+ || echo FAIL; \
+ done`; \
+ all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[ ]*//'`; \
+ fail=`echo "$$results" | grep -c '^FAIL'`; \
+ pass=`echo "$$results" | grep -c '^PASS'`; \
+ skip=`echo "$$results" | grep -c '^SKIP'`; \
+ xfail=`echo "$$results" | grep -c '^XFAIL'`; \
+ xpass=`echo "$$results" | grep -c '^XPASS'`; \
+ failures=`expr $$fail + $$xpass`; \
+ all=`expr $$all - $$skip`; \
+ if test "$$all" -eq 1; then tests=test; All=; \
+ else tests=tests; All="All "; fi; \
+ case fail=$$fail:xpass=$$xpass:xfail=$$xfail in \
+ fail=0:xpass=0:xfail=0) \
+ msg="$$All$$all $$tests passed. "; \
+ exit=true;; \
+ fail=0:xpass=0:xfail=*) \
+ msg="$$All$$all $$tests behaved as expected"; \
+ if test "$$xfail" -eq 1; then xfailures=failure; \
+ else xfailures=failures; fi; \
+ msg="$$msg ($$xfail expected $$xfailures). "; \
+ exit=true;; \
+ fail=*:xpass=0:xfail=*) \
+ msg="$$fail of $$all $$tests failed. "; \
+ exit=false;; \
+ fail=*:xpass=*:xfail=*) \
+ msg="$$failures of $$all $$tests did not behave as expected"; \
+ if test "$$xpass" -eq 1; then xpasses=pass; \
+ else xpasses=passes; fi; \
+ msg="$$msg ($$xpass unexpected $$xpasses). "; \
+ exit=false;; \
+ *) \
+ echo >&2 "incorrect case"; exit 4;; \
+ esac; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ msg="$$msg($$skip test was not run). "; \
+ else \
+ msg="$$msg($$skip tests were not run). "; \
+ fi; \
+ fi; \
+ { \
+ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
+ $(am__rst_title); \
+ echo "$$msg"; \
+ echo; \
+ echo ".. contents:: :depth: 2"; \
+ echo; \
+ for f in $$list; do \
+ test -r $$f && read line < $$f || line=; \
+ case $$line in \
+ PASS:*|XFAIL:*);; \
+ *) echo; cat $$f;; \
+ esac; \
+ done; \
+ } >$(TEST_SUITE_LOG).tmp; \
+ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
+ if test "$$failures" -ne 0; then \
+ msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG). "; \
+ if test -n "$(PACKAGE_BUGREPORT)"; then \
+ msg="$${msg}Please report to $(PACKAGE_BUGREPORT). "; \
+ fi; \
+ fi; \
+ test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \
+ $(am__tty_colors); \
+ if $$exit; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std"; \
+ $$exit || exit 1
+
+check-TESTS recheck:
+ @if test $@ != recheck; then \
+ list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
+ fi
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
+ test .log = $$f && continue; \
+ if test $@ = recheck; then \
+ test -f $$f || continue; \
+ if test -r $$f && read line < $$f; then \
+ case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
fi; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- col="$$grn"; \
- else \
- col="$$red"; \
fi; \
- echo "$${col}$$dashes$${std}"; \
- echo "$${col}$$banner$${std}"; \
- test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
- test -z "$$report" || echo "$${col}$$report$${std}"; \
- echo "$${col}$$dashes$${std}"; \
- test "$$failed" -eq 0; \
- else :; fi
+ if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
+ done; \
+ if test $@ = recheck && test -n "$$list"; then \
+ $(am__make_dryrun) || rm -f $$list || exit 1; \
+ fi; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
+recheck:
+
+am--mostlyclean-test-html:
+ list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
+ rm -f $(TEST_SUITE_HTML)
+
+.log.html:
+ @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
+ for r2h in $$list; do \
+ if ($$r2h --version) >/dev/null 2>&1; then \
+ R2H=$$r2h; \
+ fi; \
+ done; \
+ if test -z "$$R2H"; then \
+ echo >&2 "cannot find rst2html, cannot create $@"; \
+ exit 2; \
+ fi; \
+ $$R2H $< >$@.tmp
+ @mv $@.tmp $@
+
+# Be sure to run check first, and then to convert the result.
+# Beware of concurrent executions. Run "check" not "check-TESTS", as
+# check-SCRIPTS and other dependencies are rebuilt by the former only.
+# And expect check to fail.
+check-html recheck-html:
+ @target=`echo $@ | sed 's/-html$$//'`; \
+ rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
+ exit $$rv
+examples/bigxml-dtd.log: examples/bigxml-dtd
+ @p='examples/bigxml-dtd'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/bigxml-embed-ref.log: examples/bigxml-embed-ref
+ @p='examples/bigxml-embed-ref'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/bigxml-embed.log: examples/bigxml-embed
+ @p='examples/bigxml-embed'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/bigxml-relaxng.log: examples/bigxml-relaxng
+ @p='examples/bigxml-relaxng'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/bigxml-well-formed.log: examples/bigxml-well-formed
+ @p='examples/bigxml-well-formed'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/bigxml-xsd.log: examples/bigxml-xsd
+ @p='examples/bigxml-xsd'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/c14n-default-attr.log: examples/c14n-default-attr
+ @p='examples/c14n-default-attr'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/c14n-newlines.log: examples/c14n-newlines
+ @p='examples/c14n-newlines'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/c14n1.log: examples/c14n1
+ @p='examples/c14n1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/c14n2.log: examples/c14n2
+ @p='examples/c14n2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/command-help.log: examples/command-help
+ @p='examples/command-help'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/count1.log: examples/count1
+ @p='examples/count1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/countnode1.log: examples/countnode1
+ @p='examples/countnode1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/delete1.log: examples/delete1
+ @p='examples/delete1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/dtd1.log: examples/dtd1
+ @p='examples/dtd1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/dtd2.log: examples/dtd2
+ @p='examples/dtd2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/dtd3.log: examples/dtd3
+ @p='examples/dtd3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/dtd4.log: examples/dtd4
+ @p='examples/dtd4'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-2op.log: examples/ed-2op
+ @p='examples/ed-2op'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-append.log: examples/ed-append
+ @p='examples/ed-append'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-backref-delete.log: examples/ed-backref-delete
+ @p='examples/ed-backref-delete'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-backref1.log: examples/ed-backref1
+ @p='examples/ed-backref1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-backref2.log: examples/ed-backref2
+ @p='examples/ed-backref2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-expr.log: examples/ed-expr
+ @p='examples/ed-expr'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-insert.log: examples/ed-insert
+ @p='examples/ed-insert'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-literal.log: examples/ed-literal
+ @p='examples/ed-literal'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-move.log: examples/ed-move
+ @p='examples/ed-move'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-namespace.log: examples/ed-namespace
+ @p='examples/ed-namespace'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-nop.log: examples/ed-nop
+ @p='examples/ed-nop'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ed-subnode.log: examples/ed-subnode
+ @p='examples/ed-subnode'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/elem1.log: examples/elem1
+ @p='examples/elem1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/elem2.log: examples/elem2
+ @p='examples/elem2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/elem3.log: examples/elem3
+ @p='examples/elem3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/elem-depth.log: examples/elem-depth
+ @p='examples/elem-depth'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/elem-uniq.log: examples/elem-uniq
+ @p='examples/elem-uniq'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/escape1.log: examples/escape1
+ @p='examples/escape1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/exslt-ed.log: examples/exslt-ed
+ @p='examples/exslt-ed'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/exslt1.log: examples/exslt1
+ @p='examples/exslt1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/external-entity.log: examples/external-entity
+ @p='examples/external-entity'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/findfile1.log: examples/findfile1
+ @p='examples/findfile1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/genxml1.log: examples/genxml1
+ @p='examples/genxml1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/hello1.log: examples/hello1
+ @p='examples/hello1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/localname1.log: examples/localname1
+ @p='examples/localname1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/look1.log: examples/look1
+ @p='examples/look1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/move1.log: examples/move1
+ @p='examples/move1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/N-order.log: examples/N-order
+ @p='examples/N-order'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/noindent1.log: examples/noindent1
+ @p='examples/noindent1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/ns1.log: examples/ns1
+ @p='examples/ns1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/pyx.log: examples/pyx
+ @p='examples/pyx'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/pyx-ns.log: examples/pyx-ns
+ @p='examples/pyx-ns'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/recover1.log: examples/recover1
+ @p='examples/recover1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/rename-attr1.log: examples/rename-attr1
+ @p='examples/rename-attr1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/rename-elem1.log: examples/rename-elem1
+ @p='examples/rename-elem1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/schema1.log: examples/schema1
+ @p='examples/schema1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-literal.log: examples/sel-literal
+ @p='examples/sel-literal'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-if.log: examples/sel-if
+ @p='examples/sel-if'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-many-values.log: examples/sel-many-values
+ @p='examples/sel-many-values'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-root.log: examples/sel-root
+ @p='examples/sel-root'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-xpath-c.log: examples/sel-xpath-c
+ @p='examples/sel-xpath-c'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-xpath-i.log: examples/sel-xpath-i
+ @p='examples/sel-xpath-i'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-xpath-m.log: examples/sel-xpath-m
+ @p='examples/sel-xpath-m'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel-xpath-v.log: examples/sel-xpath-v
+ @p='examples/sel-xpath-v'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sel1.log: examples/sel1
+ @p='examples/sel1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sort1.log: examples/sort1
+ @p='examples/sort1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sort2.log: examples/sort2
+ @p='examples/sort2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sort3.log: examples/sort3
+ @p='examples/sort3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/structure1.log: examples/structure1
+ @p='examples/structure1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/sum1.log: examples/sum1
+ @p='examples/sum1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/tab1.log: examples/tab1
+ @p='examples/tab1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/table1.log: examples/table1
+ @p='examples/table1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/table2.log: examples/table2
+ @p='examples/table2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/table3.log: examples/table3
+ @p='examples/table3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/unicode1.log: examples/unicode1
+ @p='examples/unicode1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/update-attr1.log: examples/update-attr1
+ @p='examples/update-attr1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/update-elem1.log: examples/update-elem1
+ @p='examples/update-elem1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/valid1.log: examples/valid1
+ @p='examples/valid1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/xinclude1.log: examples/xinclude1
+ @p='examples/xinclude1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/xsl-param1.log: examples/xsl-param1
+ @p='examples/xsl-param1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+examples/xsl-sum1.log: examples/xsl-sum1
+ @p='examples/xsl-sum1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+.test.log:
+ @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@ @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
distdir: $(DISTFILES)
@list='$(MANS)'; if test -n "$$list"; then \
@@ -1126,6 +1412,9 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -1200,7 +1489,8 @@
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \
+ mostlyclean-generic
pdf: pdf-am
@@ -1215,28 +1505,33 @@
uninstall-man: uninstall-man1
-.MAKE: all check-am install-am install-strip
+.MAKE: all check-am check-html install-am install-strip recheck-html
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
- clean clean-binPROGRAMS clean-generic ctags dist dist-all \
- dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am \
- install-dist_docDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-man1 install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installcheck-binPROGRAMS \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
+.PHONY: CTAGS GTAGS all all-am am--mostlyclean-test-html am--refresh \
+ check check-TESTS check-am check-html clean clean-binPROGRAMS \
+ clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
+ dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-dist_docDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man1 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installcheck-binPROGRAMS installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am recheck recheck-html \
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-dist_docDATA uninstall-man uninstall-man1
+# TODO: figure out why log removal is needed and/or make it completely automatic
dist-hook:
+ @for log in $(srcdir)/examples/*.log ; do if [ -f "$$log" ] ; then \
+ rm $(srcdir)/examples/*.log ; \
+ echo 'ERROR: log files need to cleaned BEFORE making tarball, try again'; exit 1 ; fi ; done
@ if [ -d .git ] ; then \
if [ $(VERSION) != `$(GIT_DESCRIBE)` ] ; then \
echo 'ERROR: version mismatch, rerun autoconf -f' ; exit 1 ; fi ; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/NEWS new/xmlstarlet-1.4.1/NEWS
--- old/xmlstarlet-1.4.0/NEWS 2012-08-26 16:31:10.000000000 +0200
+++ new/xmlstarlet-1.4.1/NEWS 2012-12-08 23:31:43.000000000 +0100
@@ -1,3 +1,27 @@
+1.4.1: Dec 8, 2012
+
+ - avoid segfault when attempting to edit the document node (Bug
+ #3575722)
+
+ - Packaging:
+ - include doc/xmlstar-fodoc-style.xsl in the dist so that the
+ --enable-build-docs option works from the tarball (Bug
+ #3580667)
+ - AC_SUBST PACKAGE_TARNAME for automake so that documentation is
+ installed to the right place (Bug #3561958)
+
+ - Test Suite:
+ - avoid test failures due to XML formatting and whitespace
+ changes (also fixes Bug #3572789)
+ - use automake's parallel test suite
+ - make bigxml tests much faster by using whitespace instead of nodes
+ - don't test str:replace() with ed: it doesn't work outside of
+ xslt in new libxslt
+ - ignore extra errors from libxml 2.9.0 bug
+ - let tests run using busybox
+ - add runAllTests.sh to run tests without make
+
+
1.4.0: Aug 26, 2012
- Documentation:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/configure new/xmlstarlet-1.4.1/configure
--- old/xmlstarlet-1.4.0/configure 2012-08-26 16:31:57.000000000 +0200
+++ new/xmlstarlet-1.4.1/configure 2012-12-08 23:32:36.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac 1.4.0.
+# From configure.ac 1.4.1.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for XMLStarlet 1.4.0.
+# Generated by GNU Autoconf 2.69 for XMLStarlet 1.4.1.
#
# Report bugs to http://sourceforge.net/projects/xmlstar/support.
#
@@ -641,8 +641,8 @@
# Identity of this package.
PACKAGE_NAME='XMLStarlet'
PACKAGE_TARNAME='xmlstarlet'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='XMLStarlet 1.4.0'
+PACKAGE_VERSION='1.4.1'
+PACKAGE_STRING='XMLStarlet 1.4.1'
PACKAGE_BUGREPORT='http://sourceforge.net/projects/xmlstar/support'
PACKAGE_URL='http://xmlstar.sourceforge.net/'
@@ -1379,7 +1379,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 XMLStarlet 1.4.0 to adapt to many kinds of systems.
+\`configure' configures XMLStarlet 1.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1449,7 +1449,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of XMLStarlet 1.4.0:";;
+ short | recursive ) echo "Configuration of XMLStarlet 1.4.1:";;
esac
cat <<\_ACEOF
@@ -1570,7 +1570,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-XMLStarlet configure 1.4.0
+XMLStarlet configure 1.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2039,7 +2039,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by XMLStarlet $as_me 1.4.0, which was
+It was created by XMLStarlet $as_me 1.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2859,7 +2859,7 @@
# Define the identity of the package.
PACKAGE='xmlstarlet'
- VERSION='1.4.0'
+ VERSION='1.4.1'
# Some tools Automake needs.
@@ -6679,7 +6679,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by XMLStarlet $as_me 1.4.0, which was
+This file was extended by XMLStarlet $as_me 1.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6746,7 +6746,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-XMLStarlet config.status 1.4.0
+XMLStarlet config.status 1.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/configure.ac new/xmlstarlet-1.4.1/configure.ac
--- old/xmlstarlet-1.4.0/configure.ac 2012-08-26 18:58:05.000000000 +0200
+++ new/xmlstarlet-1.4.1/configure.ac 2012-12-08 23:32:54.000000000 +0100
@@ -1,11 +1,11 @@
AC_PREREQ([2.62])
-AC_INIT([XMLStarlet], [1.4.0],
+AC_INIT([XMLStarlet], [1.4.1],
[http://sourceforge.net/projects/xmlstar/support],
[],
[http://xmlstar.sourceforge.net/])
AC_REVISION(AC_PACKAGE_VERSION)
-AM_INIT_AUTOMAKE([1.11 foreign -Wall subdir-objects no-define std-options color-tests])
+AM_INIT_AUTOMAKE([1.11 foreign -Wall subdir-objects no-define std-options parallel-tests color-tests])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE
@@ -167,9 +167,9 @@
np_SILENT_RULE([FOP])
np_SILENT_RULE([DOCBOOK], [DBOOK])
-AM_SUBST_NOTMAKE(PACKAGE_NAME)
-AM_SUBST_NOTMAKE(PACKAGE_TARNAME)
-AM_SUBST_NOTMAKE(PACKAGE_VERSION)
+AC_SUBST(PACKAGE_NAME)
+AC_SUBST(PACKAGE_TARNAME)
+AC_SUBST(PACKAGE_VERSION)
AC_DEFINE([_XOPEN_SOURCE], [500], [needed to get lstat declaration in -ansi mode])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/doc/doc.mk new/xmlstarlet-1.4.1/doc/doc.mk
--- old/xmlstarlet-1.4.0/doc/doc.mk 2012-08-15 18:42:12.000000000 +0200
+++ new/xmlstarlet-1.4.1/doc/doc.mk 2012-11-14 03:01:11.000000000 +0100
@@ -9,6 +9,7 @@
manpage_src = doc/xmlstarlet-man.xml
generated_docs = $(userguide_gen) $(txtguide) $(manpage)
+buildfiles_docs = doc/replace-PROG-VERSION.xsl doc/xmlstar-fodoc-style.xsl
DOCBOOK_PARAMS = \
--param section.autolabel 1 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/doc/xmlstar-fodoc-style.xsl new/xmlstarlet-1.4.1/doc/xmlstar-fodoc-style.xsl
--- old/xmlstarlet-1.4.0/doc/xmlstar-fodoc-style.xsl 1970-01-01 01:00:00.000000000 +0100
+++ new/xmlstarlet-1.4.1/doc/xmlstar-fodoc-style.xsl 2012-06-18 00:05:16.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version='1.0'?>
+
participants (1)
-
root@hilbert.suse.de