Hello community, here is the log from the commit of package yelp-tools for openSUSE:Factory checked in at 2013-08-16 12:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yelp-tools (Old) and /work/SRC/openSUSE:Factory/.yelp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yelp-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/yelp-tools/yelp-tools.changes 2012-10-19 10:13:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yelp-tools.new/yelp-tools.changes 2013-08-16 12:33:20.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 30 07:11:26 UTC 2013 - dims...@opensuse.org + +- Update to version 3.9.1: + + Fixed BSD compatibility issue in calling mktemp. + + Fixed 'make pot' when srcdir != builddir. + + yelp-check validate: Validate cache files. + + yelp-check ids: New command to check Mallard page IDs. + + yelp-build epub: Fixed issue with directory for media. + +------------------------------------------------------------------- Old: ---- yelp-tools-3.6.1.tar.xz New: ---- yelp-tools-3.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp-tools.spec ++++++ --- /var/tmp/diff_new_pack.wcTn5F/_old 2013-08-16 12:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.wcTn5F/_new 2013-08-16 12:33:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yelp-tools # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: yelp-tools -Version: 3.6.1 +Version: 3.9.1 Release: 0 Summary: Collection of utilities to help create documentation License: GPL-2.0+ Group: Development/Tools/Other Url: http://projects.gnome.org/yelp/ -Source: http://download.gnome.org/sources/yelp-tools/3.6/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/yelp-tools/3.9/%{name}-%{version}.tar.xz BuildRequires: itstool BuildRequires: libxml2-tools BuildRequires: libxslt ++++++ yelp-tools-3.6.1.tar.xz -> yelp-tools-3.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/ChangeLog new/yelp-tools-3.9.1/ChangeLog --- old/yelp-tools-3.6.1/ChangeLog 2012-10-15 17:03:56.000000000 +0200 +++ new/yelp-tools-3.9.1/ChangeLog 2013-07-30 06:02:46.000000000 +0200 @@ -1,3 +1,76 @@ +commit 5769c06360989f54b44761eb50cb708ea36663e1 +Author: Shaun McCance <sha...@gnome.org> +Date: Mon Jul 29 10:07:39 2013 -0400 + + Always pass a template to mktemp for BSD compatibility + + tools/yelp-build.in | 8 ++++---- + tools/yelp-check.in | 16 ++++++++-------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 3d238cca529e10803fe4af05b1e9fba37b1bbb33 +Author: Shaun McCance <sha...@gnome.org> +Date: Sat Jul 27 11:39:09 2013 -0400 + + Validate Mallard cache files + + tools/yelp-check.in | 6 +++++- + xslt/mal-rng.xsl | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit a43c830b303c117214201d4af37e67baa6e455e5 +Author: Shaun McCance <sha...@gnome.org> +Date: Sat Jul 13 16:36:53 2013 -0400 + + yelp-check: Added command to check Mallard page IDs + + tools/yelp-check.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 52 insertions(+), 0 deletions(-) + +commit c67421d646c9d1e6afc0d8095dd2a473c9881366 +Author: Michael Terry <michael.te...@canonical.com> +Date: Thu Nov 1 09:20:05 2012 +0100 + + Fix 'make pot' when srcdir != builddir + + https://bugzilla.gnome.org/show_bug.cgi?id=655350 + + tools/yelp.m4 | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit f37331e70dd1268127445b5715f8defdee004517 +Author: Shaun McCance <sha...@gnome.org> +Date: Fri Jul 5 10:54:54 2013 -0400 + + yelp-build epub: Fixed extra dir prefix on media + + I'd added an extra "yelp/" dir to hold yelp's autogenerated files + for epub builds, but due to the way I'd structured the code, the + copied media files were also put in that directory. Except the + references to them in the XHTML didn't use the extra prefix. + + tools/yelp-build.in | 42 ++++++++++++++++++++++++------------------ + 1 files changed, 24 insertions(+), 18 deletions(-) + +commit 758fc9f914de88dfae80aa43d25c089dde0a8a15 +Author: Javier <jjar...@gnome.org> +Date: Tue Jan 8 16:08:04 2013 +0000 + + autogen.sh: Use autoreconf instead gnome-common + + autogen.sh | 26 ++++++++++++-------------- + 1 files changed, 12 insertions(+), 14 deletions(-) + +commit 7fd129fa30587ebc004ad05df7f8380e83c27b5d +Author: Shaun McCance <sha...@gnome.org> +Date: Mon Oct 15 11:05:29 2012 -0400 + + Version 3.6.1 + + NEWS | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletions(-) + commit 435dd50d85c86264b9674c9fbc9003055a7832f5 Author: Shaun McCance <sha...@gnome.org> Date: Sat Sep 29 13:08:09 2012 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/NEWS new/yelp-tools-3.9.1/NEWS --- old/yelp-tools-3.6.1/NEWS 2012-10-15 17:03:42.000000000 +0200 +++ new/yelp-tools-3.9.1/NEWS 2013-07-30 06:02:30.000000000 +0200 @@ -1,3 +1,11 @@ +3.9.1 +===== +* Fixed BSD compatibility issue in calling mktemp +* Fixed 'make pot' when srcdir != builddir (Michael Terry) +* yelp-check validate: Validate cache files +* yelp-check ids: New command to check Mallard page IDs +* yelp-build epub: Fixed issue with directory for media + 3.6.1 ===== * yelp-check: Added 'links -i' to ignore xrefs with hrefs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/configure new/yelp-tools-3.9.1/configure --- old/yelp-tools-3.6.1/configure 2012-10-15 17:03:51.000000000 +0200 +++ new/yelp-tools-3.9.1/configure 2013-07-30 06:02:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for yelp-tools 3.6.1. +# Generated by GNU Autoconf 2.66 for yelp-tools 3.9.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=yelp-tools>. # @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='yelp-tools' PACKAGE_TARNAME='yelp-tools' -PACKAGE_VERSION='3.6.1' -PACKAGE_STRING='yelp-tools 3.6.1' +PACKAGE_VERSION='3.9.1' +PACKAGE_STRING='yelp-tools 3.9.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=yelp-tools' PACKAGE_URL='' @@ -1194,7 +1194,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 yelp-tools 3.6.1 to adapt to many kinds of systems. +\`configure' configures yelp-tools 3.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1260,7 +1260,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yelp-tools 3.6.1:";; + short | recursive ) echo "Configuration of yelp-tools 3.9.1:";; esac cat <<\_ACEOF @@ -1341,7 +1341,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yelp-tools configure 3.6.1 +yelp-tools configure 3.9.1 generated by GNU Autoconf 2.66 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1358,7 +1358,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yelp-tools $as_me 3.6.1, which was +It was created by yelp-tools $as_me 3.9.1, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2173,7 +2173,7 @@ # Define the identity of the package. PACKAGE='yelp-tools' - VERSION='3.6.1' + VERSION='3.9.1' cat >>confdefs.h <<_ACEOF @@ -3226,7 +3226,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yelp-tools $as_me 3.6.1, which was +This file was extended by yelp-tools $as_me 3.9.1, which was generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3279,7 +3279,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yelp-tools config.status 3.6.1 +yelp-tools config.status 3.9.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/yelp-tools-3.6.1/configure.ac new/yelp-tools-3.9.1/configure.ac --- old/yelp-tools-3.6.1/configure.ac 2012-10-15 17:03:45.000000000 +0200 +++ new/yelp-tools-3.9.1/configure.ac 2013-07-30 06:02:33.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([yelp-tools], [3.6.1], +AC_INIT([yelp-tools], [3.9.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=yelp-tools]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/tools/yelp-build.in new/yelp-tools-3.9.1/tools/yelp-build.in --- old/yelp-tools-3.6.1/tools/yelp-build.in 2012-09-06 19:17:55.000000000 +0200 +++ new/yelp-tools-3.9.1/tools/yelp-build.in 2013-07-29 15:47:52.000000000 +0200 @@ -346,10 +346,10 @@ html_cache_file=`(cd $(dirname "$html_cache_file") && pwd)`/`basename "$html_cache_file"` else html_cache_file_is_tmp="yes" - html_cache_file=`mktemp` + html_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp_cache -o "$html_cache_file" "$@" fi - html_tmp_infile=`mktemp` + html_tmp_infile=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp_cache_in "$@" > "$html_tmp_infile" ( echo '<xsl:stylesheet' @@ -404,7 +404,7 @@ echo '</xsl:template>' echo '<xsl:template match="/">' echo '<xsl:for-each select="cache:cache/mal:page">' - echo ' <xsl:variable name="dir">' + echo ' <xsl:variable name="dir">' echo ' <xsl:call-template name="dirname">' echo ' <xsl:with-param name="str" select="substring-after(@cache:href, '\''file://'\'')"/>' echo ' </xsl:call-template>' @@ -412,10 +412,10 @@ echo ' <xsl:variable name="node" select="document(@cache:href)/mal:page"/>' # Media echo ' <xsl:for-each select="$node//mal:media | $node//e:mouseover">' - echo ' <xsl:if test="not(contains(@src, '\'':'\''))">' - echo ' <xsl:value-of select="concat($dir, @src, '"' '"')"/>' + echo ' <xsl:if test="not(contains(@src, '\'':'\''))">' + echo ' <xsl:value-of select="concat('"'-'"', $dir, @src, '"' '"')"/>' echo ' <xsl:value-of select="concat(@src, '"'
'"')"/>' - echo ' </xsl:if>' + echo ' </xsl:if>' echo ' </xsl:for-each>' # Syntax highlighting echo ' <xsl:for-each select="$node//mal:code[@mime]">' @@ -426,7 +426,7 @@ echo ' <xsl:value-of select="exsl:node-set($out)/*/html:pre[last()]/@class"/>' echo ' </xsl:variable>' echo ' <xsl:if test="starts-with($class, '\''contents syntax brush-'\'')">' - echo ' <xsl:text>'"${yelp_js_dir}"'/jquery.syntax.brush.</xsl:text>' + echo ' <xsl:text>+'"${yelp_js_dir}"'/jquery.syntax.brush.</xsl:text>' echo ' <xsl:value-of select="substring-after($class, '\''contents syntax brush-'\'')"/>' echo ' <xsl:text>.js ./
</xsl:text>' echo ' </xsl:if>' @@ -435,24 +435,24 @@ echo ' <xsl:for-each select="$node//mal:note">' echo ' <xsl:variable name="style" select="concat('\'' '\'', @style, '\'' '\'')"/>' echo ' <xsl:choose>' - echo ' <xsl:when test="contains($style, '\'' advanced '\'')">' - echo ' <xsl:text>'"${yelp_icon_dir}"'/yelp-note-advanced.png ./
</xsl:text>' - echo ' </xsl:when>' + # echo ' <xsl:when test="contains($style, '\'' advanced '\'')">' + # echo ' <xsl:text>+'"${yelp_icon_dir}"'/yelp-note-advanced.png ./
</xsl:text>' + # echo ' </xsl:when>' echo ' <xsl:when test="contains($style, '\'' bug '\'')">' - echo ' <xsl:text>'"${yelp_icon_dir}"'/yelp-note-bug.png ./
</xsl:text>' + echo ' <xsl:text>+'"${yelp_icon_dir}"'/yelp-note-bug.png ./
</xsl:text>' echo ' </xsl:when>' echo ' <xsl:when test="contains($style, '\'' important '\'')">' - echo ' <xsl:text>'"${yelp_icon_dir}"'/yelp-note-important.png ./
</xsl:text>' + echo ' <xsl:text>+'"${yelp_icon_dir}"'/yelp-note-important.png ./
</xsl:text>' echo ' </xsl:when>' echo ' <xsl:when test="contains($style, '\'' sidebar '\'')"/>' echo ' <xsl:when test="contains($style, '\'' tip '\'')">' - echo ' <xsl:text>'"${yelp_icon_dir}"'/yelp-note-tip.png ./
</xsl:text>' + echo ' <xsl:text>+'"${yelp_icon_dir}"'/yelp-note-tip.png ./
</xsl:text>' echo ' </xsl:when>' echo ' <xsl:when test="contains($style, '\'' warning '\'')">' - echo ' <xsl:text>'"${yelp_icon_dir}"'/yelp-note-warning.png ./
</xsl:text>' + echo ' <xsl:text>+'"${yelp_icon_dir}"'/yelp-note-warning.png ./
</xsl:text>' echo ' </xsl:when>' echo ' <xsl:otherwise>' - echo ' <xsl:text>'"${yelp_icon_dir}"'/yelp-note.png ./
</xsl:text>' + echo ' <xsl:text>+'"${yelp_icon_dir}"'/yelp-note.png ./
</xsl:text>' echo ' </xsl:otherwise>' echo ' </xsl:choose>' echo ' </xsl:for-each>' @@ -461,15 +461,21 @@ echo '</xsl:stylesheet>' ) | xsltproc --xinclude - "$html_tmp_infile" | sort | uniq | while read line; do - line_src=`echo "$line" | cut -d' ' -f1` + use_internal_datadir=`expr substr "$line" 1 1` + line=`expr substr "$line" 2 1000` + line_src=`echo "$line" | cut -d' ' -f1` line_src=`echo "$line_src" | urldecode` - line_dest="$html_out/$html_internal_datadir"`echo "$line" | cut -d' ' -f2` + if [ "x$use_internal_datadir" = "x+" ]; then + line_dest="$html_out/$html_internal_datadir"`echo "$line" | cut -d' ' -f2` + else + line_dest="$html_out/"`echo "$line" | cut -d' ' -f2` + fi line_dest=`echo "$line_dest" | urldecode` - if [ "$line_src" != "$line_dest" ]; then + if [ "$line_src" != "$line_dest" ]; then line_dir=`dirname "$line_dest"` mkdir_p "$line_dir" - cp "$line_src" "$line_dest" - fi + cp "$line_src" "$line_dest" + fi done cp "${yelp_js_dir}/jquery.js" "$html_out/$html_internal_datadir" cp "${yelp_js_dir}/jquery.syntax.js" "$html_out/$html_internal_datadir" @@ -564,11 +570,11 @@ epub_cache_file=`(cd $(dirname "$epub_cache_file") && pwd)`/`basename "$epub_cache_file"` else epub_cache_file_is_tmp="yes" - epub_cache_file=`mktemp` + epub_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp_cache -o "$epub_cache_file" "$@" fi html_cache_file="$epub_cache_file" - epub_data_out=`mktemp -d` + epub_data_out=`mktemp -d "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` html_out="$epub_data_out/OPS" mkdir "$html_out" mkdir "$html_out/yelp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/tools/yelp-check.in new/yelp-tools-3.9.1/tools/yelp-check.in --- old/yelp-tools-3.6.1/tools/yelp-check.in 2012-09-29 19:03:13.000000000 +0200 +++ new/yelp-tools-3.9.1/tools/yelp-check.in 2013-07-29 15:48:05.000000000 +0200 @@ -85,6 +85,7 @@ echo "Commands:" echo " comments Print the editorial comments in a document" echo " hrefs Find broken external links in a document" + echo " ids Find Mallard page IDs that do not match file names" echo " links Find broken xref or linkend links in a document" echo " orphans Find orphaned pages in a Mallard document" echo " status Report the status of Mallard pages" @@ -99,6 +100,14 @@ echo " broken ulink or XLink links in FILES in a DocBook document." ) 1>&2 } +yelp_usage_ids () { + ( + echo "Usage: yelp-check ids <FILES>" + echo "" + echo " Find pages in a Mallard document whose page ID does not match" + echo " the base file name of the page file." + ) 1>&2 +} yelp_usage_links () { ( echo "Usage: yelp-check links <FILES>" @@ -242,6 +251,46 @@ done } +yelp_ids_page () { + pageid=$(( + echo '<xsl:stylesheet' + echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform";' + echo ' xmlns:mal="http://projectmallard.org/1.0/";' + echo ' version="1.0">' + echo '<xsl:output method="text"/>' + echo '<xsl:template match="/mal:page">' + echo '<xsl:value-of select="@id"/>' + echo '</xsl:template>' + echo '</xsl:stylesheet>' + ) | xsltproc --xinclude - "$1") + if [ "$pageid.page" != `basename "$1"` ]; then + if [ `dirname "$1"` = '.' ]; then + echo `basename "$1"`": $pageid" + else + echo "$1: $pageid" + fi + exit 1 + fi +} + +yelp_ids () { + if [ "$#" = "0" -o "x$1" = "x--help" ]; then + yelp_usage_ids + exit 1 + fi + ret=0 + for xml in "$@"; do + if [ -d "$xml" ]; then + for page in "$xml"/*.page; do + yelp_ids_page "$page" || ret=$? + done + else + yelp_ids_page "$xml" || ret=$? + fi + done + exit $ret +} + yelp_links_db () { ( echo '<xsl:stylesheet' @@ -333,12 +382,12 @@ if [ "x$check_cache_file" != "x" ]; then check_cache_file=`(cd $(dirname "$check_cache_file") && pwd)`/`basename "$check_cache_file"` fi - check_out_file=`mktemp` + check_out_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` for xml in "$@"; do if [ -d "$xml" ]; then if [ "x$check_cache_file" = "x" ]; then check_cache_file_is_tmp="yes" - check_cache_file=`mktemp` + check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp-build cache -o "$check_cache_file" "$@" fi for page in "$xml"/*.page; do @@ -351,7 +400,7 @@ else if [ "x$check_cache_file" = "x" ]; then check_cache_file_is_tmp="yes" - check_cache_file=`mktemp` + check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp-build cache -o "$check_cache_file" "$@" fi yelp_links_page "$xml" @@ -419,10 +468,10 @@ check_cache_file=`(cd $(dirname "$check_cache_file") && pwd)`/`basename "$check_cache_file"` else check_cache_file_is_tmp="yes" - check_cache_file=`mktemp` + check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp-build cache -o "$check_cache_file" "$@" fi - check_out_file=`mktemp` + check_out_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` for xml in "$@"; do if [ -d "$xml" ]; then for page in "$xml"/*.page; do @@ -519,7 +568,7 @@ yelp_usage_status exit 1 fi - check_cache_file=`mktemp` + check_cache_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` yelp-build cache -o "$check_cache_file" "$@" xsltproc \ --stringparam version "$check_version" \ @@ -539,11 +588,12 @@ # Using temp files because pipes create subshells, making it really # hard to return the right exit status in a portable way. if [ "x$check_rng_dir" = "x" ]; then - check_rng_dir=`mktemp -d` + check_rng_dir=`mktemp -d "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` fi - check_out_file=`mktemp` + check_out_file=`mktemp "${TMPDIR:-/tmp}"/yelp-XXXXXXXX` check_rng_file=`( echo '<xsl:stylesheet' + echo ' xmlns:cache="http://projectmallard.org/cache/1.0/";' echo ' xmlns:xsl="http://www.w3.org/1999/XSL/Transform";' echo ' version="1.0">' echo '<xsl:output method="text"/>' @@ -552,6 +602,9 @@ echo '<xsl:when test="string(@version) != '"''"'">' echo '<xsl:value-of select="@version"/>' echo '</xsl:when>' + echo '<xsl:when test="/cache:cache">' + echo '<xsl:text>cache/1.0 1.0</xsl:text>' + echo '</xsl:when>' echo '<xsl:otherwise>' echo '<xsl:text>1.0</xsl:text>' echo '</xsl:otherwise>' @@ -599,7 +652,7 @@ for page in "$xml"/*.page; do yelp_validate_page "$page" || gret="$?" done - elif [ "x$ext" = "xpage" ]; then + elif [ "x$ext" = "xpage" -o "x$ext" = "xcache" ]; then yelp_validate_page "$xml" || gret="$?" else xmllint --noout --xinclude --noent --postvalid "$xml" || gret="$?" @@ -621,6 +674,9 @@ "xhrefs") yelp_hrefs "$@" ;; + "xids") + yelp_ids "$@" + ;; "xlinks") yelp_links "$@" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/tools/yelp.m4 new/yelp-tools-3.9.1/tools/yelp.m4 --- old/yelp-tools-3.6.1/tools/yelp.m4 2012-04-16 19:59:47.000000000 +0200 +++ new/yelp-tools-3.9.1/tools/yelp.m4 2013-07-13 18:12:19.000000000 +0200 @@ -52,7 +52,8 @@ .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") .PHONY: repo repo: $(_HELP_POTFILE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yelp-tools-3.6.1/xslt/mal-rng.xsl new/yelp-tools-3.9.1/xslt/mal-rng.xsl --- old/yelp-tools-3.6.1/xslt/mal-rng.xsl 2012-03-06 19:52:06.000000000 +0100 +++ new/yelp-tools-3.9.1/xslt/mal-rng.xsl 2013-07-27 17:38:14.000000000 +0200 @@ -3,9 +3,10 @@ xmlns:str="http://exslt.org/strings"; xmlns:exsl="http://exslt.org/common"; xmlns:mal="http://projectmallard.org/1.0/"; + xmlns:cache="http://projectmallard.org/cache/1.0/"; xmlns:rng="http://relaxng.org/ns/structure/1.0"; xmlns="http://relaxng.org/ns/structure/1.0"; - exclude-result-prefixes="mal str exsl rng" + exclude-result-prefixes="mal cache str exsl rng" version="1.0"> <xsl:param name="rng.strict" select="false()"/> @@ -16,6 +17,9 @@ <xsl:when test="string(@version) != ''"> <xsl:value-of select="@version"/> </xsl:when> + <xsl:when test="/cache:cache"> + <xsl:value-of select="'cache/1.0 1.0'"/> + </xsl:when> <xsl:otherwise> <xsl:value-of select="'1.0'"/> </xsl:otherwise> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
