Merge tag '2.1' into develop

Stable release DAPS 2.1:

- added support for webhelp
- added support for <xi:include ... parse="text"> (issue #71)
- handling of passing XSLT parameters on the command line has been
  improved (issue #263)
- improved handling of doxcuments that do not need to be profiled
- daps_autobuild: changed the order of builds to increase performance
- Bugfix package-src: removed extraneous text
- Bugfix daps_autobuild: in case no rebuild was necessary, rsync
                         deleted the previous results
- Bugfix DB4 -> DB5 migration: Fixed various issues in the migration
                               stylesheet

ChangeLog

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Jul 02 14:38:11 UTC 2015 - fsundermeyer@opensuse.org
+
+Stable release DAPS 2.1:
+- added support for webhelp
+  Please note the following when using the DocBook webhelp
+  stylsheets:
+  * building with ROOTID should be avoided (does not generate
+    sidebar)
+  * building webhelp is slow, speed up by adjusting the chunk size,
+    recommended parameters are
+    "chunk.fast 1" and "chunk.section.depth 0"
+- added support for <xi:include ... parse="text"> (issue #71)
+- handling of passing XSLT parameters on the command line has been
+  improved (issue #263), use
+  * --param "KEY=VALUE" and --stringparam "KEY=VALUE"
+  * use of --xsltparam still supported for compatibility reasons, but
+    should be avoided; support will be removed in future versions
+  * each parameter can be specified multiple times
+  * bopth parameters are supported for the following subcommands:
+    epub, html, man, pdf, text, webhelp
+  * changes only apply to the command-line - settings in the DC-file
+    still need to be done with XSLTPARAM as before
+- improved handling of doxcuments that do not need to be profiled
+- daps_autobuild: changed the order of builds to increase performance
+- Bugfix package-src: removed extraneous text
+- Bugfix daps_autobuild: in case no rebuild was necessary, rsync
+                         deleted the previous results
+- Bugfix DB4 -> DB5 migration: Fixed various issues in the migration
+                               stylesheet
+
 -------------------------------------------------------------------
 Fri Jun 19 09:21:31 UTC 2015 - fsundermeyer@opensuse.org
 
@@ -10,7 +41,7 @@ Stable release DAPS 2.0:
 - fixed a quoting issue in daps-migrate and daps_functions
 - fixed an error in the DB4->DB5 migration stylesheet (formatting
   was lost on <term> tags)
-	
+
 -------------------------------------------------------------------
 Tue Jun 10 13:50:00 UTC 2015 - fs@opensuse.org
 

INSTALL.adoc

@@ -115,7 +115,7 @@ information about the support status on your system.
 === Installation
 
 
-1. Download the https://github.com/openSUSE/daps/archive/2.0.tar.gz[DAPS 2.0]
+1. Download the https://github.com/openSUSE/daps/archive/2.1.tar.gz[DAPS 2.1]
 archive and unpack it _or_, alternatively clone the master branch from GitHub: +
    `git clone https://github.com/openSUSE/daps.git -b master --single-branch` 
 2. Change into the daps directory
@@ -141,14 +141,6 @@ archive and unpack it _or_, alternatively clone the master branch from GitHub: +
 5. Run `sudo make install`
 6. Run `daps --help` for a brief introduction in DAPS
 
-.Ubuntu: Workaround for Faulty Catalog Entries
-[NOTE]
-Ubuntu 14.10 ("Utopic Unicorn") ships a buggy xmlcatalog binary that creates
-wrong catalog entries for DAPS. To work around this issue, copy the file
-+Ubuntu_catalog_fix+ to +catalogs/for-catalog-daps.xml+ after having run `make'
-
-
-
 [[anchor-2]]
 == Running DAPS from a GitHub Checkout
 

README.adoc

@@ -20,6 +20,8 @@ DAPS packages are available for openSUSE and SUSE Linux Enterprise. It has
 also been successfully tested on Debian, Fedora, and Ubuntu. See
 https://github.com/openSUSE/daps/blob/master/INSTALL.adoc for installation
 instructions. 
+The latest version,  https://github.com/openSUSE/daps/archive/2.1.tar.gz[DAPS
+2.1], was released on 2015-07-02.
 
 Contributing
 ------------

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for DAPS 2.0.0.
+# Generated by GNU Autoconf 2.69 for DAPS 2.1.0.
 #
 # Report bugs to <https://github.com/openSUSE/daps>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='DAPS'
 PACKAGE_TARNAME='daps'
-PACKAGE_VERSION='2.0.0'
-PACKAGE_STRING='DAPS 2.0.0'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='DAPS 2.1.0'
 PACKAGE_BUGREPORT='https://github.com/openSUSE/daps'
 PACKAGE_URL='http://opensuse.github.io/daps'
 
@@ -1264,7 +1264,7 @@ if test "$ac_init_help" = "long"; then
   # 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 DAPS 2.0.0 to adapt to many kinds of systems.
+\`configure' configures DAPS 2.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1330,7 +1330,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of DAPS 2.0.0:";;
+     short | recursive ) echo "Configuration of DAPS 2.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1419,7 +1419,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-DAPS configure 2.0.0
+DAPS configure 2.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1436,7 +1436,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by DAPS $as_me 2.0.0, which was
+It was created by DAPS $as_me 2.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1787,9 +1787,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 DAPS_VERSION_MAJOR=2
-DAPS_VERSION_MINOR=0
+DAPS_VERSION_MINOR=1
 DAPS_VERSION_MICRO=0
-DAPS_VERSION=2.0.0
+DAPS_VERSION=2.1.0
 DAPS_API_VERSION=2
 
 
@@ -2349,7 +2349,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='daps'
- VERSION='2.0.0'
+ VERSION='2.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4537,7 +4537,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by DAPS $as_me 2.0.0, which was
+This file was extended by DAPS $as_me 2.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4591,7 +4591,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-DAPS config.status 2.0.0
+DAPS config.status 2.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -5746,7 +5746,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by DAPS $as_me 2.0.0, which was
+This file was extended by DAPS $as_me 2.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5800,7 +5800,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-DAPS config.status 2.0.0
+DAPS config.status 2.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -10,7 +10,7 @@ dnl Thomas Schraitle  <toms at opensuse dot org>
 dnl
 
 m4_define(daps_version_major, 2)
-m4_define(daps_version_minor, 0)
+m4_define(daps_version_minor, 1)
 m4_define(daps_version_micro, [0])
 # API version
 m4_define([daps_api_version],[daps_version_major])

packaging/daps.spec

@@ -17,11 +17,11 @@
 
 
 Name:           daps
-Version:        2.0
+Version:        2.1
 Release:        0
 
 ###############################################################
-# 
+#
 # ATTENTION: Do NOT edit this file outside of
 #            https://svn.code.sf.net/p/daps/svn/trunk/daps/packaging/daps.spec
 #
@@ -201,7 +201,7 @@ exit 0
 # only run if package is really uninstalled ($1 = 0) and not
 # in case of an update
 #
-if [ 0 = $1 ]; then 
+if [ 0 = $1 ]; then
   edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
   --del %{name}
 fi