From 1fb7c44408d6dea727e00ada6bf4096c6b9c62c1 Mon Sep 17 00:00:00 2001 From: Stefan Knorr Date: Thu, 10 Jun 2021 12:14:49 +0200 Subject: [PATCH] Update change log, version number for DAPS 3.2.0 --- ChangeLog | 27 +++++++++++++++ Makefile.in | 92 ++++++++++++---------------------------------------- configure | 92 +++++++++------------------------------------------- configure.ac | 4 +-- 4 files changed, 64 insertions(+), 151 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25b5c7ca0..feedb8d1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Jun 10 10:00:00 UTC 2021 - sknorr@suse.de + +Stable release DAPS 3.2.0: + +* New features: + - Added config file compatible with xmlformat 1.9 (from + github.com/someth2say/xmlformat) + - Added DocBook table validation script (must be run manually + currently) + +* Bug fixes: + - Properly enabled `--validate-ids` and `--validate-images` + validation options + - For consistency/compatibility, output PDFNAME deprecation + message to stderr + - In AsciiDoc postprocess stylesheet, fixed handling of + subtitles + - Removed remaining references to Ghostscript (#614) + +* Removed features: + - Remove `html --jsp` target that was unused for years (#609) + - Removed the `online-docs` target and associated DocBook 5-to-4 + conversion stylesheets (#610) + - Removed code to query SVN properties that was unused for years + (#611) + ------------------------------------------------------------------- Fri May 21 15:00:00 UTC 2021 - sknorr@suse.de diff --git a/Makefile.in b/Makefile.in index 1755f2279..f153fa54a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,7 +23,7 @@ # Generate catalogs and install daps # # -# TODO: +# TODO: # Stylesheets for building xhtml need to be packaged in src tar @@ -114,9 +114,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(dist_emacssite_DATA) $(dist_fopconf_DATA) \ $(dist_hyphen_DATA) $(dist_template_DATA) $(dist_xepconf_DATA) \ $(dist_xsltasciidoc_DATA) $(dist_xsltcommon_DATA) \ - $(dist_xsltcontrib_DATA) $(dist_xsltdb5todb4_DATA) \ - $(dist_xsltdesktop_DATA) $(dist_xsltepub_DATA) \ - $(dist_xsltindex_DATA) $(dist_xsltjsp_DATA) \ + $(dist_xsltcontrib_DATA) $(dist_xsltdesktop_DATA) \ + $(dist_xsltepub_DATA) $(dist_xsltindex_DATA) \ $(dist_xsltlib_DATA) $(dist_xsltmallard_DATA) \ $(dist_xsltmigrate_DATA) $(dist_xsltprofiling_DATA) \ $(dist_xsltrelnotes_DATA) $(dist_xsltxhtml_DATA) \ @@ -161,9 +160,8 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" \ "$(DESTDIR)$(fopconfdir)" "$(DESTDIR)$(hyphendir)" \ "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(xepconfdir)" \ "$(DESTDIR)$(xsltasciidocdir)" "$(DESTDIR)$(xsltcommondir)" \ - "$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdb5todb4dir)" \ - "$(DESTDIR)$(xsltdesktopdir)" "$(DESTDIR)$(xsltepubdir)" \ - "$(DESTDIR)$(xsltindexdir)" "$(DESTDIR)$(xsltjspdir)" \ + "$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdesktopdir)" \ + "$(DESTDIR)$(xsltepubdir)" "$(DESTDIR)$(xsltindexdir)" \ "$(DESTDIR)$(xsltlibdir)" "$(DESTDIR)$(xsltmallarddir)" \ "$(DESTDIR)$(xsltmigratedir)" "$(DESTDIR)$(xsltprofilingdir)" \ "$(DESTDIR)$(xsltrelnotesdir)" "$(DESTDIR)$(xsltxhtmldir)" \ @@ -206,9 +204,8 @@ DATA = $(dist_bashcompletion_DATA) $(dist_catalog_DATA) \ $(dist_fopconf_DATA) $(dist_hyphen_DATA) $(dist_template_DATA) \ $(dist_xepconf_DATA) $(dist_xsltasciidoc_DATA) \ $(dist_xsltcommon_DATA) $(dist_xsltcontrib_DATA) \ - $(dist_xsltdb5todb4_DATA) $(dist_xsltdesktop_DATA) \ - $(dist_xsltepub_DATA) $(dist_xsltindex_DATA) \ - $(dist_xsltjsp_DATA) $(dist_xsltlib_DATA) \ + $(dist_xsltdesktop_DATA) $(dist_xsltepub_DATA) \ + $(dist_xsltindex_DATA) $(dist_xsltlib_DATA) \ $(dist_xsltmallard_DATA) $(dist_xsltmigrate_DATA) \ $(dist_xsltprofiling_DATA) $(dist_xsltrelnotes_DATA) \ $(dist_xsltxhtml_DATA) $(dist_xsltyelp_DATA) @@ -317,7 +314,6 @@ ECHO_T = @ECHO_T@ EPUBCHECK = @EPUBCHECK@ EXIFTOOL = @EXIFTOOL@ GREP = @GREP@ -GS = @GS@ HAVE_PYMOD_LXML = @HAVE_PYMOD_LXML@ INKSCAPE = @INKSCAPE@ INSTALL = @INSTALL@ @@ -505,11 +501,9 @@ xsltcontribdir = $(xsltdir)/contrib xsltdesktopdir = $(xsltdir)/desktop xsltepubdir = $(xsltdir)/epub xsltindexdir = $(xsltdir)/index -xsltjspdir = $(xsltdir)/jsp xsltlibdir = $(xsltdir)/lib xsltmallarddir = $(xsltdir)/mallard xsltmigratedir = $(xsltdir)/migrate -xsltdb5todb4dir = $(xsltdir)/migrate/db5to4 xsltprofilingdir = $(xsltdir)/profiling xsltrelnotesdir = $(xsltdir)/relnotes xsltxhtmldir = $(xsltdir)/xhtml @@ -525,6 +519,8 @@ dist_dapslibexec_SCRIPTS = $(filter-out $(wildcard libexec/daps-jing.*),$(wildca # CONFIG files dist_dapsconf_DATA = etc/config etc/docbook-xmlformat.conf \ + etc/docbook-xmlformat-1.04.conf \ + etc/docbook-xmlformat-1.9.conf \ etc/CatalogManager.properties dist_fopconf_DATA = etc/fop/fop-daps.xml @@ -536,7 +532,7 @@ dist_hyphen_DATA = $(wildcard etc/xep/hyphen/*.tex) \ dist_bashcompletion_DATA = bash_completion/daps # DATA -@CATALOG_EDIT_FALSE@dist_catalog_DATA = $(DAPS_CATALOG) +@CATALOG_EDIT_FALSE@dist_catalog_DATA = $(DAPS_CATALOG) dist_dapslib_DATA = $(wildcard lib/*) dist_emacssite_DATA = misc/docbook_macros.el dist_dapsmake_DATA = $(wildcard make/*.mk) @@ -550,11 +546,9 @@ dist_xsltcontrib_DATA = $(wildcard daps-xslt/contrib/*.xsl) dist_xsltdesktop_DATA = $(wildcard daps-xslt/desktop/*.xsl) dist_xsltepub_DATA = $(wildcard daps-xslt/epub/*.xsl) dist_xsltindex_DATA = $(wildcard daps-xslt/index/*.xsl) -dist_xsltjsp_DATA = $(wildcard daps-xslt/jsp/*.xsl) dist_xsltlib_DATA = $(wildcard daps-xslt/lib/*.xsl) dist_xsltmallard_DATA = $(wildcard daps-xslt/mallard/*.xsl) dist_xsltmigrate_DATA = $(wildcard daps-xslt/migrate/*.xsl) -dist_xsltdb5todb4_DATA = $(wildcard daps-xslt/migrate/db5to4/*.xsl) dist_xsltprofiling_DATA = $(wildcard daps-xslt/profiling/*.xsl) dist_xsltrelnotes_DATA = $(wildcard daps-xslt/relnotes/*.xsl) dist_xsltxhtml_DATA = $(wildcard daps-xslt/xhtml/*.xsl) @@ -1014,27 +1008,6 @@ uninstall-dist_xsltcontribDATA: @list='$(dist_xsltcontrib_DATA)'; test -n "$(xsltcontribdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(xsltcontribdir)'; $(am__uninstall_files_from_dir) -install-dist_xsltdb5todb4DATA: $(dist_xsltdb5todb4_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_xsltdb5todb4_DATA)'; test -n "$(xsltdb5todb4dir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(xsltdb5todb4dir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(xsltdb5todb4dir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsltdb5todb4dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(xsltdb5todb4dir)" || exit $$?; \ - done - -uninstall-dist_xsltdb5todb4DATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_xsltdb5todb4_DATA)'; test -n "$(xsltdb5todb4dir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(xsltdb5todb4dir)'; $(am__uninstall_files_from_dir) install-dist_xsltdesktopDATA: $(dist_xsltdesktop_DATA) @$(NORMAL_INSTALL) @list='$(dist_xsltdesktop_DATA)'; test -n "$(xsltdesktopdir)" || list=; \ @@ -1098,27 +1071,6 @@ uninstall-dist_xsltindexDATA: @list='$(dist_xsltindex_DATA)'; test -n "$(xsltindexdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(xsltindexdir)'; $(am__uninstall_files_from_dir) -install-dist_xsltjspDATA: $(dist_xsltjsp_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_xsltjsp_DATA)'; test -n "$(xsltjspdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(xsltjspdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(xsltjspdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsltjspdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(xsltjspdir)" || exit $$?; \ - done - -uninstall-dist_xsltjspDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_xsltjsp_DATA)'; test -n "$(xsltjspdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(xsltjspdir)'; $(am__uninstall_files_from_dir) install-dist_xsltlibDATA: $(dist_xsltlib_DATA) @$(NORMAL_INSTALL) @list='$(dist_xsltlib_DATA)'; test -n "$(xsltlibdir)" || list=; \ @@ -1574,7 +1526,7 @@ check: check-recursive all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(catalogdir)" "$(DESTDIR)$(dapsconfdir)" "$(DESTDIR)$(dapslibdir)" "$(DESTDIR)$(dapsmakedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(emacssitedir)" "$(DESTDIR)$(fopconfdir)" "$(DESTDIR)$(hyphendir)" "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(xepconfdir)" "$(DESTDIR)$(xsltasciidocdir)" "$(DESTDIR)$(xsltcommondir)" "$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdb5todb4dir)" "$(DESTDIR)$(xsltdesktopdir)" "$(DESTDIR)$(xsltepubdir)" "$(DESTDIR)$(xsltindexdir)" "$(DESTDIR)$(xsltjspdir)" "$(DESTDIR)$(xsltlibdir)" "$(DESTDIR)$(xsltmallarddir)" "$(DESTDIR)$(xsltmigratedir)" "$(DESTDIR)$(xsltprofilingdir)" "$(DESTDIR)$(xsltrelnotesdir)" "$(DESTDIR)$(xsltxhtmldir)" "$(DESTDIR)$(xsltyelpdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dapslibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(catalogdir)" "$(DESTDIR)$(dapsconfdir)" "$(DESTDIR)$(dapslibdir)" "$(DESTDIR)$(dapsmakedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(emacssitedir)" "$(DESTDIR)$(fopconfdir)" "$(DESTDIR)$(hyphendir)" "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(xepconfdir)" "$(DESTDIR)$(xsltasciidocdir)" "$(DESTDIR)$(xsltcommondir)" "$(DESTDIR)$(xsltcontribdir)" "$(DESTDIR)$(xsltdesktopdir)" "$(DESTDIR)$(xsltepubdir)" "$(DESTDIR)$(xsltindexdir)" "$(DESTDIR)$(xsltlibdir)" "$(DESTDIR)$(xsltmallarddir)" "$(DESTDIR)$(xsltmigratedir)" "$(DESTDIR)$(xsltprofilingdir)" "$(DESTDIR)$(xsltrelnotesdir)" "$(DESTDIR)$(xsltxhtmldir)" "$(DESTDIR)$(xsltyelpdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1636,9 +1588,8 @@ install-data-am: install-data-local install-dist_bashcompletionDATA \ install-dist_fopconfDATA install-dist_hyphenDATA \ install-dist_templateDATA install-dist_xepconfDATA \ install-dist_xsltasciidocDATA install-dist_xsltcommonDATA \ - install-dist_xsltcontribDATA install-dist_xsltdb5todb4DATA \ - install-dist_xsltdesktopDATA install-dist_xsltepubDATA \ - install-dist_xsltindexDATA install-dist_xsltjspDATA \ + install-dist_xsltcontribDATA install-dist_xsltdesktopDATA \ + install-dist_xsltepubDATA install-dist_xsltindexDATA \ install-dist_xsltlibDATA install-dist_xsltmallardDATA \ install-dist_xsltmigrateDATA install-dist_xsltprofilingDATA \ install-dist_xsltrelnotesDATA install-dist_xsltxhtmlDATA \ @@ -1698,9 +1649,8 @@ uninstall-am: uninstall-dist_bashcompletionDATA \ uninstall-dist_fopconfDATA uninstall-dist_hyphenDATA \ uninstall-dist_templateDATA uninstall-dist_xepconfDATA \ uninstall-dist_xsltasciidocDATA uninstall-dist_xsltcommonDATA \ - uninstall-dist_xsltcontribDATA uninstall-dist_xsltdb5todb4DATA \ - uninstall-dist_xsltdesktopDATA uninstall-dist_xsltepubDATA \ - uninstall-dist_xsltindexDATA uninstall-dist_xsltjspDATA \ + uninstall-dist_xsltcontribDATA uninstall-dist_xsltdesktopDATA \ + uninstall-dist_xsltepubDATA uninstall-dist_xsltindexDATA \ uninstall-dist_xsltlibDATA uninstall-dist_xsltmallardDATA \ uninstall-dist_xsltmigrateDATA \ uninstall-dist_xsltprofilingDATA \ @@ -1728,9 +1678,8 @@ uninstall-man: uninstall-man1 install-dist_hyphenDATA install-dist_templateDATA \ install-dist_xepconfDATA install-dist_xsltasciidocDATA \ install-dist_xsltcommonDATA install-dist_xsltcontribDATA \ - install-dist_xsltdb5todb4DATA install-dist_xsltdesktopDATA \ - install-dist_xsltepubDATA install-dist_xsltindexDATA \ - install-dist_xsltjspDATA install-dist_xsltlibDATA \ + install-dist_xsltdesktopDATA install-dist_xsltepubDATA \ + install-dist_xsltindexDATA install-dist_xsltlibDATA \ install-dist_xsltmallardDATA install-dist_xsltmigrateDATA \ install-dist_xsltprofilingDATA install-dist_xsltrelnotesDATA \ install-dist_xsltxhtmlDATA install-dist_xsltyelpDATA \ @@ -1749,9 +1698,8 @@ uninstall-man: uninstall-man1 uninstall-dist_fopconfDATA uninstall-dist_hyphenDATA \ uninstall-dist_templateDATA uninstall-dist_xepconfDATA \ uninstall-dist_xsltasciidocDATA uninstall-dist_xsltcommonDATA \ - uninstall-dist_xsltcontribDATA uninstall-dist_xsltdb5todb4DATA \ - uninstall-dist_xsltdesktopDATA uninstall-dist_xsltepubDATA \ - uninstall-dist_xsltindexDATA uninstall-dist_xsltjspDATA \ + uninstall-dist_xsltcontribDATA uninstall-dist_xsltdesktopDATA \ + uninstall-dist_xsltepubDATA uninstall-dist_xsltindexDATA \ uninstall-dist_xsltlibDATA uninstall-dist_xsltmallardDATA \ uninstall-dist_xsltmigrateDATA \ uninstall-dist_xsltprofilingDATA \ @@ -1779,7 +1727,7 @@ bin/daps bin/daps-xmlformat etc/config $(FOP_CONFIG) $(JING_WRAPPER): $(USERGUID all-local: $(USERGUIDE) $(QUICKSTART) $(dist_man1_MANS) $(DAPS_CATALOG) -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 \ diff --git a/configure b/configure index 3c1d4bc5b..02c4fe6e8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for DAPS 3.1.2. +# Generated by GNU Autoconf 2.69 for DAPS 3.2.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='DAPS' PACKAGE_TARNAME='daps' -PACKAGE_VERSION='3.1.2' -PACKAGE_STRING='DAPS 3.1.2' +PACKAGE_VERSION='3.2.0' +PACKAGE_STRING='DAPS 3.2.0' PACKAGE_BUGREPORT='https://github.com/openSUSE/daps' PACKAGE_URL='https://opensuse.github.io/daps' @@ -616,7 +616,6 @@ PDFFONTS OODRAW OPTIPNG INKSCAPE -GS EXIFTOOL DIA CONVERT @@ -1271,7 +1270,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 3.1.2 to adapt to many kinds of systems. +\`configure' configures DAPS 3.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1337,7 +1336,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DAPS 3.1.2:";; + short | recursive ) echo "Configuration of DAPS 3.2.0:";; esac cat <<\_ACEOF @@ -1426,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DAPS configure 3.1.2 +DAPS configure 3.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1443,7 +1442,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 3.1.2, which was +It was created by DAPS $as_me 3.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1794,9 +1793,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu DAPS_VERSION_MAJOR=3 -DAPS_VERSION_MINOR=1 -DAPS_VERSION_MICRO=2 -DAPS_VERSION=3.1.2 +DAPS_VERSION_MINOR=2 +DAPS_VERSION_MICRO=0 +DAPS_VERSION=3.2.0 DAPS_API_VERSION=3 @@ -2351,7 +2350,7 @@ fi # Define the identity of the package. PACKAGE='daps' - VERSION='3.1.2' + VERSION='3.2.0' cat >>confdefs.h <<_ACEOF @@ -3455,48 +3454,6 @@ fi -# Extract the first word of "gs", so it can be a program name with args. -set dummy gs; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GS="$GS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GS" && ac_cv_path_GS="0" - ;; -esac -fi -GS=$ac_cv_path_GS -if test -n "$GS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GS" >&5 -$as_echo "$GS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "inkscape", so it can be a program name with args. set dummy inkscape; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4851,7 +4808,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 3.1.2, which was +This file was extended by DAPS $as_me 3.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4905,7 +4862,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 3.1.2 +DAPS config.status 3.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6064,7 +6021,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 3.1.2, which was +This file was extended by DAPS $as_me 3.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6118,7 +6075,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 3.1.2 +DAPS config.status 3.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6866,25 +6823,6 @@ $as_echo "Enhanced debugging | yes |" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: -Experimental features ---------------------- -Feature | Enabled | Action to enable -.............................................................................." >&5 -$as_echo " -Experimental features ---------------------- -Feature | Enabled | Action to enable -.............................................................................." >&6; } -if test 0 = "$GS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Support for .pdf and .eps images | no | install ghostscript" >&5 -$as_echo "Support for .pdf and .eps images | no | install ghostscript" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Support for .pdf and .eps images | yes |" >&5 -$as_echo "Support for .pdf and .eps images | yes |" >&6; } -fi - - eval "eval SYSCONFDIR=$sysconfdir/daps" eval "eval DATADIR=$datadir/daps" eval "eval BINDIR=$bindir" diff --git a/configure.ac b/configure.ac index 1189f20f0..0d0f478d1 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ dnl Thomas Schraitle dnl m4_define(daps_version_major, 3) -m4_define(daps_version_minor, 1) -m4_define(daps_version_micro, [2]) +m4_define(daps_version_minor, 2) +m4_define(daps_version_micro, [0]) # API version m4_define([daps_api_version],[daps_version_major])