Merge branch 'release/2.3.0'

ChangeLog

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Fri Aug 04 12:36:01 UTC 2016 - [email protected]
+
+Stable release DAPS 2.3.0:
+
+* New Features:
+  - Config File Parser:
+    Up to now, config files (DC-files, /tec/daps/config and
+    ~/.config/daps/dapsrc) have been sourced. This has been a major
+    security issue, since every shell code gets executed when a file
+    is being sourced. DAPS 2.3.0 now comes with a parser that fixes
+    this security hole. Apart from one exception (see below) existing
+    config files do _not_ need to be changed. However, the parser
+    offers more flexibility, see
+    https://github.com/openSUSE/daps/blob/develop/etc/config.in
+    for documentation (the manuals has not been upfdated, yet).
+    The only exception that requires changes in the config file is
+    something like FOO="$FOO bar" To concatenate values, use "+="
+    now. See the following commit for an example:
+    https://github.com/openSUSE/daps/commit/7a2ce04
+  - Bash Completion:
+    TAB-completion for DAPS has been one of the very first feature
+    requests we opened (almost five years ago). Now we finally
+    managed to conquer the black Bash magic required to get it!
+  - Automatically detect the DocBook 5 version: If you have
+    DocBook 5.1 installed, docbookxi.rng from 5.1 will
+    automatically be used as the validating schema for DocBook 5
+    documents. If you rather want to use the 5.0 schema
+    or a custom schema, set DOCBOOK5_RNG_URI accordingly in
+    /etc/daps/config (for a system wide configuration), in
+    $HOME/.config/daps/dapsrc (for a user specific configuration),
+    or in the DC-file (for a document-specific configuration)
+
+* Bugfixes:
+  - subcommand "locdrop" failed when the book did not include
+    images
+  - spellcheck now ignores text in <replaceable> tags
+  - obsolete daps-susespell has been removed (replaced by
+    daps ... spellcheck long ago)
+  - paths starting with "~" were not always correctly resolved
+  - several fixes for ePUB, among them a fix that now correctly
+    chooses mediaobject entries with role="html" rather than
+    choosing the first one listed ion the XML source
+  - #10 : Generate TAB completion
+  - #359: Drop bash 3 suppor
+  - #369: Code review: Check Variable Assignments
+  - #375: Issues with the xmlformat target
+
 -------------------------------------------------------------------
 Wed Jun 15 11:58:00 UTC 2016 - [email protected]
 

Makefile.am

@@ -9,7 +9,7 @@
 #
 # TODO: 
 # Stylesheets for building xhtml need to be packaged in src tar
-DIST_DEBIAN:=1
+
 #------------------------
 AUTOMAKE_OPTIONS = 1.10 foreign dist-bzip2 no-dist-gzip no-installinfo \
 			-Wall -Werror -Wno-portability
@@ -22,12 +22,14 @@ EXTRA_DIST := COPYING-2.0 COPYING-3.0 packaging/daps.spec
 #------------------------
 # Replace placeholders with distribution-specfic paths
 #
+
 REPL_PATH = sed \
              -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
              -e 's|@bindir[@]|$(bindir)|g' \
              -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
              -e 's|@datadir[@]|$(datadir)|g' \
              -e 's|@prefix[@]|$(prefix)|g' \
+             -e 's|@db5version[@]|$(db5_version)|g' \
              -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g'
 
 DAPSROOT     := $(abs_top_srcdir)
@@ -72,7 +74,7 @@ endif
 # Man pages
 DC_MANPAGES    := DC-daps-manpages
 MAN_PAGE_DIR   := $(subst DC-,,$(DC_MANPAGES))
-MAN_PAGES      := daps.1 ccecho.1 daps-init.1 daps-susespell.1 daps-autobuild.1
+MAN_PAGES      := daps.1 ccecho.1 daps-init.1 daps-autobuild.1
 MAN_BUILD_PATH := $(srcdir)/man/build/$(MAN_PAGE_DIR)/man/
 
 # Manuals
@@ -100,6 +102,7 @@ dapslibexecdir = $(pkgdatadir)/libexec
 dapsmakedir    = $(pkgdatadir)/make
 emacssitedir   = @datadir@/emacs/site-lisp
 templatedir    = $(pkgdatadir)/init_templates
+bashcompletiondir =@datadir@/bash-completion/completions
 
 htmldocdir     = @docdir@/html
 
@@ -124,7 +127,8 @@ xsltyelpdir      = $(xsltdir)/yelp
 
 # BIN
 dist_bin_SCRIPTS         = $(wildcard bin/*[^.in] $(BUILD_ROOT)/bin/*)
-dist_dapslibexec_SCRIPTS = $(wildcard libexec/*)
+# exclude daps-jing.*
+dist_dapslibexec_SCRIPTS = $(filter-out $(wildcard libexec/daps-jing.*),$(wildcard libexec/*))
 
 # CONFIG files
 dist_dapsconf_DATA    = etc/config etc/docbook-xmlformat.conf \
@@ -133,6 +137,8 @@ dist_fopconf_DATA     = etc/fop/fop-daps.xml
 dist_xepconf_DATA     = etc/xep/xep-daps.xml
 dist_hyphen_DATA      = $(wildcard etc/xep/hyphen/*.tex) \
 			$(wildcard etc/xep/hyphen/*.il2)
+# BASH completion
+dist_bashcompletion_DATA = bash_completion/daps
 
 # DATA
 if !CATALOG_EDIT		
@@ -171,7 +177,7 @@ dist_man1_MANS      = $(addprefix $(MAN_BUILD_PATH), $(MAN_PAGES))
 # sure the local config, as provided by the repo, is used. Otherwise we have
 # a mixture of system and repo setup and that will not work
 
-bin/daps etc/config $(FOP_CONFIG) $(JING_WRAPPER): $(USERGUIDE) $(QUICKSTART) $(dist_man1_MANS)
+bin/daps bin/daps-xmlformat etc/config $(FOP_CONFIG) $(JING_WRAPPER): $(USERGUIDE) $(QUICKSTART) $(dist_man1_MANS)
 
 all-local: $(USERGUIDE) $(QUICKSTART) $(dist_man1_MANS) $(DAPS_CATALOG)
 
@@ -183,7 +189,7 @@ INSTALLDIRS = $(DESTDIR)$(docdir)/html $(DESTDIR)$(pkgdatadir) \
 	$(DESTDIR)$(templatedir)
 
 
-install-data-local: $(INSTALLDIRS) autobuild/daps-autobuild
+install-data-local: $(INSTALLDIRS) autobuild/daps-autobuild 
 install-data-local: TMP_CATALOG := $(shell mktemp -q $(BUILD_ROOT)/daps_catalog.XXXXX)
 install-data-local:
 	for BOOK in $(MANUALS); do \
@@ -220,7 +226,8 @@ endif
 clean-local:
 	rm -rf build/ man/build/ doc/build/
 	(cd autobuild && ln -sf daps-autobuild.in daps-autobuild)
-	(cd bin && ln -sf daps.in daps)
+	(cd bin && (ln -sf daps.in daps; ln -sf daps-xmlformat.in daps-xmlformat))
+	(cd bin && ln -sf daps-xmlformat.in daps-xmlformat)
 	(cd etc && ln -sf config.in config)
 	(cd etc/fop && ln -sf fop-daps.suse $(notdir $(FOP_CONFIG)))
 	(cd libexec && ln -sf $(notdir $(JING_WRAPPER_DEFAULT)) $(notdir $(JING_WRAPPER)))
@@ -291,7 +298,7 @@ $(FIRSTBUILD): $(BUILD_ROOT)
 	touch $@
 
 # see http://www.gnu.org/software/autoconf/manual/autoconf.html#Installation-Directory-Variables
-bin/daps: $(FIRSTBUILD)
+bin/daps bin/daps-xmlformat: $(FIRSTBUILD)
 	if [ -L $@ ]; then rm -f $@; fi
 	$(REPL_PATH) $@.in > $@
 	chmod +x $@