tested for rpm and deb

6 years ago · 0644f3b2d0
parent 0f2d67ec41
commit 0644f3b2d0
20 changed files with 487 additions and 464 deletions
--- a/163
+++ b/163
@ -1,163 +0,0 @@
 2017-01-10 10:31  
 	* [r25] ChangeLog, src/matrix.hxx, test/matricxx.cxx:
 	  new feature p-norm
 2017-01-09 16:07  
 	* [r24] COPYING, ChangeLog, INSTALL, src/matrix.hxx,
 	  test/matricxx.cxx:
 	  fix bug in sign comparision
 2017-01-08 08:54  
 	* [r23] bootstrap.sh, debian/changelog.in:
 	  rebuilt debian/changelog.in
 2017-01-07 13:31  
 	* [r22] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
 	  build-in-docker.conf, build-in-docker.sh, debian/control.in,
 	  doc/plantuml.jar[ADD], resolve-debbuilddeps.sh,
 	  resolve-rpmbuilddeps.sh:
 	  build system updated
 2016-09-02 08:44  
 	* [r21] configure.ac:
 	  fixed project url
 2016-08-28 07:58  
 	* [r20] COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4,
 	  bootstrap.sh:
 	  documentation fixed
 2016-08-26 14:10  
 	* [r19] COPYING, INSTALL, ax_init_standard_project.m4,
 	  bootstrap.sh, doc/doxyfile.in:
 	  updated documentation build
 2016-08-25 19:53  
 	* [r18] configure.ac, debian/control.in, src/matrix.hxx,
 	  test/basic.cxx[DEL], test/makefile.am, test/matricxx.cxx[CPY]:
 	  documentation updated
 2016-08-25 18:56  
 	* [r17] README, ax_init_standard_project.m4, bootstrap.sh,
 	  configure.ac, doc/header.html.in, doc/style.css:
 	  documentation anhanced
 2016-08-25 18:02  
 	* [r16] COPYING, ChangeLog, INSTALL, README,
 	  ax_init_standard_project.m4, doc/doxyfile.in,
 	  doc/footer.html.in[ADD], doc/header.html.in[ADD],
 	  doc/style.css[ADD], test/matricxx.cxx[ADD]:
 	  documentation anhanced
 2016-08-25 15:00  
 	* [r15] README, ax_init_standard_project.m4, bootstrap.sh,
 	  doc/doxyfile.in, src/matrix.hxx:
 	  improved doxygen
 2016-08-24 09:42  
 	* [r14] src/libmatricxx.pc.in:
 	  PKG_REQUIREMENTS is undefined
 2016-08-23 13:58  
 	* [r13] debian/control.in, src/makefile.am, src/matrix.hxx,
 	  test/basic.cxx, test/makefile.am:
 	  stream any size of matrix
 2016-08-23 13:09  
 	* [r12] configure.ac, src/matrix.hxx, test/basic.cxx:
 	  works perfectly, fully tested
 2016-08-22 15:04  
 	* [r11] COPYING, INSTALL, src/matrix.hxx, test/basic.cxx:
 	  inverse tested
 2016-08-22 07:07  
 	* [r10] ChangeLog, src/matrix.hxx, test/basic.cxx:
 	  inverse does not work yet
 2016-08-19 16:07  
 	* [r9] COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4,
 	  ax_init_standard_project.m4, makefile_test.inc.am:
 	  fix C++11 detection
 2016-08-19 14:52  
 	* [r8] COPYING, INSTALL, ax_cxx_compile_stdcxx_11.m4,
 	  ax_init_standard_project.m4, bootstrap.sh,
 	  makefile_test.inc.am[ADD], src/matrix.hxx, test/basic.cxx:
 	  more operators more tests
 2016-08-18 22:03  
 	* [r7] COPYING, ChangeLog, INSTALL, src/matrix.hxx:
 	  more operators
 2016-08-17 07:26  
 	* [r6] configure.ac:
 	  only requires c++11
 2016-08-16 14:41  
 	* [r5] COPYING, INSTALL, ax_init_standard_project.m4, configure.ac,
 	  src/matrix.hxx, test/basic.cxx:
 	  remove redundancy, collect common functionality in base class
 2016-08-08 20:03  
 	* [r4] src/matrix.hxx, test/basic.cxx:
 	  more operator, more checks passed
 2016-08-03 18:43  
 	* [r3] configure.ac, test/makefile.am:
 	  all tests passed
 2016-08-03 18:39  
 	* [r2] COPYING[ADD], ChangeLog, INSTALL[ADD],
 	  ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4,
 	  configure.ac, examples/makefile.am,
 	  examples/matrix-sample.cxx[ADD], src/makefile.am,
 	  src/matrix.hxx[ADD], test/basic.cxx[ADD], test/makefile.am:
 	  first approach including first tests
 2016-07-30 08:50  
 	* [r1] .[ADD], AUTHORS[ADD], ChangeLog[ADD], NEWS[ADD],
 	  README[ADD], autogen.sh[ADD], ax_check_qt.m4[ADD],
 	  ax_cxx_compile_stdcxx_11.m4[ADD],
 	  ax_init_standard_project.m4[ADD], bootstrap.sh[ADD],
 	  build-in-docker.conf[ADD], build-in-docker.sh[ADD],
 	  build-resource-file.sh[ADD], configure.ac[ADD], debian[ADD],
 	  debian/changelog.in[ADD], debian/compat[ADD],
 	  debian/control.in[ADD], debian/docs[ADD],
 	  debian/libmatricxx-dev.install[ADD],
 	  debian/libmatricxx.install[ADD], debian/rules[ADD], doc[ADD],
 	  doc/doxyfile.in[ADD], doc/makefile.am[ADD], examples[ADD],
 	  examples/makefile.am[ADD], libmatricxx.desktop.in[ADD],
 	  libmatricxx.spec.in[ADD], mac-create-app-bundle.sh[ADD],
 	  makefile.am[ADD], resolve-debbuilddeps.sh[ADD],
 	  resolve-rpmbuilddeps.sh[ADD], sql-to-dot.sed[ADD], src[ADD],
 	  src/libmatricxx.pc.in[ADD], src/makefile.am[ADD],
 	  src/version.cxx[ADD], src/version.hxx[ADD], test[ADD],
 	  test/makefile.am[ADD]:
 	  initial project
--- a/README.md
+++ b/README.md
@ -1,4 +1,5 @@
 C++ Matrix Template Library
 ===========================
 Library to provide mathematical matrices as standard C++ types that behave like standard types.
@ -34,7 +35,7 @@ Example with templated size:
        std::cerr<<"Ooops!\n";
      }
-Example with templated size:
+Example with given size:
      const Matrix<T> m1(2, 4,
                         1, 2, 3, 4,
--- a/ax_check_qt.m4
+++ b/ax_check_qt.m4
@ -119,10 +119,17 @@ AC_DEFUN([AX_CHECK_QT], [
    AC_DEFINE([HAVE_$1])
    QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
    qt_host_bins=$(${PKG_CONFIG} --variable=host_bins Qt5Core)
-    if test -d "${qt_host_bins}"; then
+    qt_libdir=$(${PKG_CONFIG} --variable=libdir Qt5Core)
-      QT_PLUGIN_PATH=${qt_host_bins}/../plugins
+    if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
-    else
+      QT_PLUGIN_PATH="${qt_libdir}/plugins"
-      QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
+    elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
      QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
    elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
      QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
    elif test -d "${QTDIR}/plugins; then
      QT_PLUGIN_PATH="${QTDIR}/plugins"
    elif test -d "${QTDIR}/share/qt5/plugins; then
      QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
    fi
    MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
    [$1]_CPPFLAGS="${[$1]5_CFLAGS}"
@ -166,10 +173,17 @@ AC_DEFUN([AX_CHECK_QT], [
      AC_DEFINE([HAVE_$1])
      QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
      qt_host_bins=$(${PKG_CONFIG} --variable=host_bins QtCore)
-      if test -d "${qt_host_bins}"; then
+      qt_libdir=$(${PKG_CONFIG} --variable=libdir QtCore)
-        QT_PLUGIN_PATH=${qt_host_bins}/../plugins
+      if test -d "${qt_libdir}" -a -d "${qt_libdir}/plugins"; then
-      else
+        QT_PLUGIN_PATH="${qt_libdir}/plugins"
-        QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
+      elif test -d "${qt_libdir}/qt5" -a -d "${qt_libdir}/qt5/plugins"; then
        QT_PLUGIN_PATH="${qt_libdir}/qt5/plugins"
      elif test -d "${qt_host_bins}" -a -d "${qt_host_bins}/../plugins"; then
        QT_PLUGIN_PATH="${qt_host_bins}/../plugins"
      elif test -d "${QTDIR}/plugins; then
        QT_PLUGIN_PATH="${QTDIR}/plugins"
      elif test -d "${QTDIR}/share/qt5/plugins; then
        QT_PLUGIN_PATH="${QTDIR}/share/qt5/plugins"
      fi
      MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
      [$1]_CPPFLAGS="${[$1]_CFLAGS}"
@ -214,9 +228,6 @@ AC_DEFUN([AX_CHECK_QT], [
    AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
  fi
  test "x$prefix" = xNONE && prefix=$ac_default_prefix
  if test "${QT_PLUGIN_PATH}" = "${QT_PLUGIN_PATH#${prefix}}"; then
    QT_PLUGIN_PATH=${prefix}${QT_PLUGIN_PATH#/usr}
  fi
  AC_ARG_WITH([qt-plugin-path],
              [AS_HELP_STRING([--with-qt-plugin-path=PATH],
                              [define a different qt plugin path, current @<:@default=check@:>@])],
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@ -1,4 +1,4 @@
-## @id $Id$
+## @id $Id: ax_init_standard_project.m4 204 2016-09-29 18:29:53Z marc $
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
@ -218,8 +218,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AX_SUBST(AUTHOR_URL)
  AX_SUBST(AUTHOR_MAIL)
  AX_SUBST(PACKAGER)
-  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
+  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
-  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
+  for path in . .. ../.. ../../..; do
    if test -d ${path}/.svn; then
      PROJECT_URL="$(LANG= svn info | sed -n 's,^Repository Root: ,,p')"
      break
    elif test -d ${path}/.git; then
      PROJECT_URL="$(git remote get-url origin)"
      break
    fi
  done
  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${PROJECT_URL}}"
  AX_SUBST(PROJECT_URL)
  AX_SUBST(SOURCE_DOWNLOAD)
  VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
@ -365,12 +374,13 @@ AC_DEFUN([AX_USE_CXX], [
 #### Begin: Appended by $0
 %.app: %
 	-rm -r [\$][@]
-	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
+	\$(MAKE) DESTDIR=[\$][\$](pwd)/tmp install
 	QTDIR="\${QTDIR}" \
 	QT_PLUGINS="\${QT_PLUGINS}" \
 	QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \
 	  \${top_builddir}/mac-create-app-bundle.sh \
-	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
+	    [\$][@] [\$][<] [\$][\$](pwd)/tmp[\$]{prefix}
 	-rm -rf tmp
 maintainer-clean-cxx-targets:
 	-rm makefile.in
@ -1066,13 +1076,16 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
 # Check if a package exists in the current distribution, if yes, require it
 # in debian/control.in append @DEB_DEPEND_IFEXISTS@ to Build-Depends
 # if you pass a list, it will require the first matching, if any matches
 #  - parameter:
-#     $1 = package name
+#     $1 = space separated list of package names
 AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
-  pkg="$1"
+  for pkg in $1; do
-  if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
+    if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
-     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
+       DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
-  fi
+       break
    fi
  done
 ])
 # require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
@ -1109,17 +1122,19 @@ AC_DEFUN([AX_DEB_RESOLVE], [
 # Check if a package exists in the current distribution, if yes, require it
 # in .spec.in append @RPM_DEPEND_IFEXISTS@ to Build-Depends
 # if you pass a list, it will require the first matching, if any matches
 #  - parameter:
-#     $1 = package name
+#     $1 = space separated package names
 AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
-  pkg="$1"
+  for pkg in $1; do
-  
+    if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
-  if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
+       (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
-     (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
+       (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
-     (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
+       (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
-     (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
+         RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
-       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
+	 break
-  fi
+    fi
  done
 ])
 # require package in .spec.in append @RPM_BUILD_DEPEND@ to Build-Depends
@ -1160,36 +1175,23 @@ AC_DEFUN([AX_RPM_RESOLVE], [
 # Check if a package exists in the current distribution, if yes, require it
 # in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends
 # if you pass a list, it will require the first matching, if any matches
 #  - parameter:
-#     $1 = package name
+#     $1 = space separated list of package names
 AC_DEFUN([AX_ALL_DEPEND_IFEXISTS], [
-  pkg="$1"
+  AX_DEB_DEPEND_IFEXISTS([$1])
-  if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
+  AX_RPM_DEPEND_IFEXISTS([$1])
     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
  fi
  if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
     (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
  fi
 ])
 # Check if a package exists in the current distribution, if yes, require it
 # in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends
 # if you pass a list, it will require the first matching, if any matches
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_ALL_DEPEND_IFEXISTS_DEV], [
-  pkg="$1"
+  pkgs="$1"
-  if test -n "$(apt-cache policy -q ${pkg}-dev 2> /dev/null)"; then
+  AX_DEB_DEPEND_IFEXISTS([${pkgs// /-dev }-dev])
-     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}-dev"
+  AX_RPM_DEPEND_IFEXISTS([${pkgs// /-devel }-devel])
  fi
  if (test -x /usr/bin/zypper && zypper search -x "$pkg"-devel 1>&2 > /dev/null) || \
     (test -x /usr/bin/dnf && dnf list -q "$pkg"-devel 1>&2 > /dev/null) || \
     (test -x /usr/bin/yum && yum list -q "$pkg"-devel 1>&2 > /dev/null) || \
     (test -x /usr/sbin/urpmq && urpmq "$pkg"-devel 1>&2 > /dev/null); then
       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}-devel"
  fi
 ])
 # require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -1,7 +1,7 @@
 #! /bin/bash
 ## @file
 ##
-## $Id$
+## $Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $
 ##
 ## $Date: 2004/08/31 15:57:19 $
 ## $Author: marc $
@ -41,7 +41,7 @@ while test $# -gt 0; do
        (--no-vcs|-n) novcs=1;;
        (--exclude-vcs|-x) shift; excludevcs+=("$1");;
        (--version|-v)
-            echo "$Id$";
+            echo "$Id: bootstrap.sh 52 2015-11-03 15:38:21Z marc $";
            exit;;
        (--help|-h) less <<EOF
 SYNOPSIS
@ -1352,7 +1352,7 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 LDADD = -l${PACKAGE_NAME#lib}
-exampledir = ${docdir}/examples
+exampledir = \${docdir}/examples
 example_DATA = 
 MAINTAINERCLEANFILES = makefile.in
@ -1605,8 +1605,8 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 -- @PACKAGER@  @BUILD_DATE@
 EOF
-    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)"
+    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; fi)"
-    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev | qt4-dev,"; fi)"
    to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@ -1678,7 +1678,7 @@ fi)
 $(if testtag AX_RPM_DEPEND; then echo "Requires: @RPM_DEPEND@"; fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: which, pkgconfig, pandoc, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
+BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
    if testtag AX_USE_CXX; then
      echo -n ", binutils-devel, gcc-c++"
    fi
@ -1700,13 +1700,17 @@ BuildRequires: lsb-release$(
      echo -n ", libqt5-qtbase-devel, libqt5-qttools, libqt5-linguist-devel, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel";
    fi)
 %else
 %if  0%{?mageia}
 BuildRequires: rpm-sign, lsb-release
 $(
    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
-      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
+      echo -n "BuildRequires: qtbase5-common-devel, qttools5, lib64qt5webkit-devel, lib64qt5webkitwidgets-devel";
    fi)
 %if  0%{?mageia}
 BuildRequires: rpm-sign, lsb-release
 %else
 $(
    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
    fi)
 BuildRequires: rpm-sign, redhat-lsb
 %global debug_package %{nil}
 %endif
@ -1715,6 +1719,9 @@ $(
    if testtag AX_USE_DOXYGEN; then cat <<EOS
 %if ! 0%{?centos}
 BuildRequires: mscgen
 %if ! 0%{?mageia}
 BuildRequires: pandoc
 %endif
 %endif
 EOS
    fi
@ -1766,7 +1773,7 @@ $(if testtag AX_USE_ETC; then
 cat <<EOF2
 %config
-/etc/*
+/etc
 EOF2
 fi)
@ -1875,6 +1882,7 @@ $(if test -e README.md -a ! -e README; then
 cat <<EOF2
 README: README.md
 	cp README.md README
 CLEANFILES = README
 EOF2
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@ -248,16 +248,18 @@ case $mode in
            docker exec ${DOCKER_ID} update-locale LANG=${LANG}
        fi
        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
-        for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
+        PREVENT='libpam-systemd policykit.* colord dconf-service'
-            docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
+        for f in ${PREVENT}; do
            docker exec ${DOCKER_ID} bash -c "echo 'Package: ${f}' >> /etc/apt/preferences"
            docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
            docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
        done
        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
        docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
        for key in "${keys[@]}"; do
            wget -O- "$key" \
                | docker exec -i ${DOCKER_ID} apt-key add -
@ -265,9 +267,12 @@ case $mode in
        for repo in "${repos[@]}"; do
            ifthenelse "${repo}" "apt-add-repository 'ARG'"
        done
        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
        for package in "${packages[@]}"; do
-            ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
+            ifthenelse "${package}" "apt-get install ${OPTIONS} ${PREVENT} ARG"
        done
        for command in "${commands[@]}"; do
            ifthenelse "${command}" "ARG"
@ -294,11 +299,14 @@ EOF
            LSB_RELEASE=/usr/bin/lsb_release
        fi
        docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget $LSB_RELEASE
        if docker exec ${DOCKER_ID} test -x /usr/bin/dnf; then
            docker exec ${DOCKER_ID} dnf install -y 'dnf-command(config-manager)'
        fi
        i=0
        for key in "${keys[@]}"; do
-            wget -Orpm-key "$key"
+            docker exec -i ${DOCKER_ID} wget -Orpm-key "$key"
            docker exec -i ${DOCKER_ID} rpm --import rpm-key
-            rm rpm-key
+            docker exec -i ${DOCKER_ID} rm rpm-key
        done
        for repo in "${repos[@]}"; do
            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
--- a/configure.ac
+++ b/configure.ac
@ -17,9 +17,6 @@ AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
 AM_INIT_AUTOMAKE([1.9 tar-pax parallel-tests color-tests])
 AX_INIT_STANDARD_PROJECT
 PROJECT_URL="https://dev.marc.waeckerlin.org/redmine/projects/libmatricxx/"
 SOURCE_DOWNLOAD="https://dev.marc.waeckerlin.org/repository/sources/libmatricxx/"
 # requirements, uncomment, what you need:
 AX_USE_CXX
 AX_USE_LIBTOOL
@ -39,4 +36,4 @@ AX_BUILD_EXAMPLES
 AX_REQUIRE_STDCXX_11
 # create output
-AC_OUTPUT
+AX_OUTPUT
--- a/debian/control.in
+++ b/debian/control.in
@ -1,18 +1,18 @@
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @PACKAGER@
-Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release , doxygen, graphviz, mscgen, default-jre-headless|default-jre, libcppunit-dev
+Build-Depends: debhelper, fakeroot, git2cl, git, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, libcppunit-dev @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Package: @PACKAGE_NAME@
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends} @DEB_DEPEND@
 Description: @DESCRIPTION@
@README_DEB@
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release , doxygen, graphviz, mscgen, default-jre-headless|default-jre, libcppunit-dev
+Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, fakeroot, git2cl, git, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, libcppunit-dev @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
@README_DEB@
--- a/debian/docs
+++ b/debian/docs
@ -1,2 +1,2 @@
 NEWS
-README
+README.md
--- a/debian/libmatricxx-dev.install
+++ b/debian/libmatricxx-dev.install
@ -3,5 +3,5 @@ usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
 usr/share/libmatricxx
 usr/share/doc/libmatricxx/html
 usr/share/doc/libmatricxx/examples
--- a/debian/rules
+++ b/debian/rules
@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Sat, 30 July 2016 10:47:21 +0200
+##  -  on Sat, 04 August 2018 09:28:30 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.in
@ -1,4 +1,4 @@
-# Doxyfile 1.8.6
+# Doxyfile 1.8.11
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@ -46,10 +46,10 @@ PROJECT_NUMBER         = @PACKAGE_VERSION@
 PROJECT_BRIEF          = @DESCRIPTION@
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# the documentation. The maximum height of the logo should not exceed 55 pixels
+# in the documentation. The maximum height of the logo should not exceed 55
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# to the output directory.
+# the logo to the output directory.
 PROJECT_LOGO           = @top_srcdir@/@PACKAGE_LOGO@
@ -60,7 +60,7 @@ PROJECT_LOGO           = @top_srcdir@/@PACKAGE_LOGO@
 OUTPUT_DIRECTORY       =
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
 # will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
@ -70,6 +70,14 @@ OUTPUT_DIRECTORY       =
 CREATE_SUBDIRS         = NO
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
 # U+3044.
 # The default value is: NO.
 ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
@ -85,14 +93,14 @@ CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
 # The default value is: YES.
 BRIEF_MEMBER_DESC      = YES
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
 # description of a member or function before the detailed description
 #
 # Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
@ -127,7 +135,7 @@ ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = YES
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
 # before files name in the file list and in the header files. If set to NO the
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
@ -197,9 +205,9 @@ MULTILINE_CPP_IS_BRIEF = YES
 INHERIT_DOCS           = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# new page for each member. If set to NO, the documentation of a member will be
+# page for each member. If set to NO, the documentation of a member will be part
-# part of the file/class/namespace that contains it.
+# of the file/class/namespace that contains it.
 # The default value is: NO.
 SEPARATE_MEMBER_PAGES  = NO
@ -270,11 +278,14 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# (default is Fortran), use: inc=Fortran f=C.
+# Fortran. In the later case the parser tries to guess whether the code is fixed
 # or free formatted code, this is the default for Fortran type files), VHDL. For
 # instance to make doxygen treat .inc files as Fortran files (default is PHP),
 # and .f files as C (default is Fortran), use: inc=Fortran f=C.
 #
-# Note For files without extension you can use no_extension as a placeholder.
+# Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
@ -293,8 +304,8 @@ MARKDOWN_SUPPORT       = YES
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
+# be prevented in individual cases by putting a % sign in front of the word or
-# or globally by setting AUTOLINK_SUPPORT to NO.
+# globally by setting AUTOLINK_SUPPORT to NO.
 # The default value is: YES.
 AUTOLINK_SUPPORT       = YES
@ -334,13 +345,20 @@ SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
+# tag is set to YES then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 # The default value is: NO.
 DISTRIBUTE_GROUP_DOC   = YES
 # If one adds a struct or class to a group and this option is enabled, then also
 # any nested class or struct is added to the same group. By default this option
 # is disabled and one has to add nested compounds explicitly via \ingroup.
 # The default value is: NO.
 GROUP_NESTED_COMPOUNDS = NO
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
 # type (e.g. under the Public Functions section). Set it to NO to prevent
@ -399,7 +417,7 @@ LOOKUP_CACHE_SIZE      = 0
 # Build related configuration options
 #---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
 # documentation are documented, even if no documentation was available. Private
 # class members and static file members will be hidden unless the
 # EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
@ -409,35 +427,35 @@ LOOKUP_CACHE_SIZE      = 0
 EXTRACT_ALL            = YES
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
 # be included in the documentation.
 # The default value is: NO.
 EXTRACT_PRIVATE        = YES
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
 # scope will be included in the documentation.
 # The default value is: NO.
 EXTRACT_PACKAGE        = YES
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
 # included in the documentation.
 # The default value is: NO.
 EXTRACT_STATIC         = YES
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
+# locally in source files will be included in the documentation. If set to NO,
 # only classes defined in header files are included. Does not have any effect
 # for Java sources.
 # The default value is: YES.
 EXTRACT_LOCAL_CLASSES  = YES
-# This flag is only useful for Objective-C code. When set to YES local methods,
+# This flag is only useful for Objective-C code. If set to YES, local methods,
 # which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
 # included.
 # The default value is: NO.
@ -462,21 +480,21 @@ HIDE_UNDOC_MEMBERS     = NO
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
+# to NO, these classes will be included in the various overviews. This option
-# no effect if EXTRACT_ALL is enabled.
+# has no effect if EXTRACT_ALL is enabled.
 # The default value is: NO.
 HIDE_UNDOC_CLASSES     = NO
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
+# (class|struct|union) declarations. If set to NO, these declarations will be
 # included in the documentation.
 # The default value is: NO.
 HIDE_FRIEND_COMPOUNDS  = NO
 # If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
+# documentation blocks found inside the body of a function. If set to NO, these
 # blocks will be appended to the function's detailed documentation block.
 # The default value is: NO.
@ -490,7 +508,7 @@ HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
 # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
+# names in lower-case letters. If set to YES, upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
@ -499,12 +517,19 @@ INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
+# their full class and namespace scopes in the documentation. If set to YES, the
 # scope will be hidden.
 # The default value is: NO.
 HIDE_SCOPE_NAMES       = NO
 # If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
 # append additional text to a page's title, such as Class Reference. If set to
 # YES the compound reference will be hidden.
 # The default value is: NO.
 HIDE_COMPOUND_REFERENCE= NO
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@ -532,14 +557,14 @@ INLINE_INFO            = YES
 # If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
 # (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
+# name. If set to NO, the members will appear in declaration order.
 # The default value is: YES.
 SORT_MEMBER_DOCS       = YES
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
 # descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note that
+# name. If set to NO, the members will appear in declaration order. Note that
 # this will also influence the order of the classes in the class list.
 # The default value is: NO.
@ -584,27 +609,25 @@ SORT_BY_SCOPE_NAME     = NO
 STRICT_PROTO_MATCHING  = NO
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# todo list. This list is created by putting \todo commands in the
+# list. This list is created by putting \todo commands in the documentation.
 # documentation.
 # The default value is: YES.
 GENERATE_TODOLIST      = YES
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# test list. This list is created by putting \test commands in the
+# list. This list is created by putting \test commands in the documentation.
 # documentation.
 # The default value is: YES.
 GENERATE_TESTLIST      = YES
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
 # list. This list is created by putting \bug commands in the documentation.
 # The default value is: YES.
 GENERATE_BUGLIST       = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
 # the deprecated list. This list is created by putting \deprecated commands in
 # the documentation.
 # The default value is: YES.
@ -629,8 +652,8 @@ ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
+# the bottom of the documentation of classes and structs. If set to YES, the
-# will mention the files that were used to generate the documentation.
+# list will mention the files that were used to generate the documentation.
 # The default value is: YES.
 SHOW_USED_FILES        = YES
@ -678,8 +701,7 @@ LAYOUT_FILE            =
 # to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# search path. See also \cite for info how to create references.
 # also \cite for info how to create references.
 CITE_BIB_FILES         =
@ -695,7 +717,7 @@ CITE_BIB_FILES         =
 QUIET                  = NO
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
 # this implies that the warnings are on.
 #
 # Tip: Turn warnings on while writing the documentation.
@ -703,7 +725,7 @@ QUIET                  = NO
 WARNINGS               = YES
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
 # warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
 # will automatically be disabled.
 # The default value is: YES.
@ -720,12 +742,18 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# value. If set to NO, doxygen will only warn about wrong or incomplete
-# documentation, but not about the absence of documentation.
+# parameter documentation, but not about the absence of documentation.
 # The default value is: NO.
 WARN_NO_PARAMDOC       = NO
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
 # a warning is encountered.
 # The default value is: NO.
 WARN_AS_ERROR          = NO
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@ -749,7 +777,7 @@ WARN_LOGFILE           = doxygen.errors
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
 # directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 INPUT                  = @top_srcdir@/src
@ -766,12 +794,17 @@ INPUT_ENCODING         = UTF-8
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
+# *.h) to filter out the source-files in the directories.
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+#
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# Note that for custom extensions or not directly supported extensions you also
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# read by doxygen.
-# *.qsf, *.as and *.js.
+#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
 # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
 # *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
 FILE_PATTERNS          = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql
@ -857,6 +890,10 @@ IMAGE_PATH             =
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
 INPUT_FILTER           =
@ -866,11 +903,15 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
 #
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
 FILTER_PATTERNS        = *.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
+# INPUT_FILTER) will also be used to filter the input files that are used for
 # producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
 # The default value is: NO.
@ -930,7 +971,7 @@ REFERENCED_BY_RELATION = NO
 REFERENCES_RELATION    = NO
 # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
 # REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
 # link to the documentation.
 # The default value is: YES.
@ -977,6 +1018,25 @@ USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 # If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
 # clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
 # cost of reduced performance. This can be particularly helpful with template
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
 # Note: The availability of this option depends on whether or not doxygen was
 # generated with the -Duse-libclang=ON option for CMake.
 # The default value is: NO.
 CLANG_ASSISTED_PARSING = NO
 # If clang assisted parsing is enabled you can provide the compiler with command
 # line options that you would normally use when invoking the compiler. Note that
 # the include paths will already be set by doxygen for the files and directories
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 CLANG_OPTIONS          =
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@ -1007,7 +1067,7 @@ IGNORE_PREFIX          =
 # Configuration options related to the HTML output
 #---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 GENERATE_HTML          = YES
@ -1069,13 +1129,15 @@ HTML_FOOTER            = footer.html
 HTML_STYLESHEET        =
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# defined cascading style sheet that is included after the standard style sheets
+# cascading style sheets that are included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
+# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
+# Doxygen will copy the style sheet files to the output directory.
-# see the documentation.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 HTML_EXTRA_STYLESHEET  = style.css
@ -1091,7 +1153,7 @@ HTML_EXTRA_STYLESHEET  = style.css
 HTML_EXTRA_FILES       =
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
+# will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
 # http://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
@ -1122,11 +1184,12 @@ HTML_COLORSTYLE_GAMMA  = 80
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
+# to YES can help to show when doxygen was last run and thus if the
-# The default value is: YES.
+# documentation is up to date.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = NO
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@ -1219,28 +1282,29 @@ GENERATE_HTMLHELP      = NO
 CHM_FILE               =
 # The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
 # doxygen will try to run the HTML help compiler on the generated index.hhp.
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 HHC_LOCATION           =
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# YES) or that it should be included in the master .chm file ( NO).
+# (YES) or that it should be included in the master .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 GENERATE_CHI           = NO
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 CHM_INDEX_ENCODING     =
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# The BINARY_TOC flag controls whether a binary table of contents is generated
-# YES) or a normal table of contents ( NO) in the .chm file.
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
 # enables the Previous and Next buttons.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
@ -1345,7 +1409,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@ -1353,7 +1417,7 @@ DISABLE_INDEX          = YES
 # index structure (just like the one that is generated for HTML Help). For this
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
 # further fine-tune the look of the index. As an example, the default style
 # sheet generated by doxygen has an example that shows how to put an image at
 # the root of the tree instead of the PROJECT_NAME. Since the tree basically has
@ -1381,7 +1445,7 @@ ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
 # external symbols imported via tag files in a separate window.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@ -1410,7 +1474,7 @@ FORMULA_TRANSPARENT    = YES
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
 # http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
 # to it using the MATHJAX_RELPATH option.
@ -1480,11 +1544,11 @@ SEARCHENGINE           = NO
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# setting. When disabled, doxygen will generate a PHP script for searching and
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# enabled the indexing and searching needs to be provided by external tools. See
+# and searching needs to be provided by external tools. See the section
-# the section "External Indexing and Searching" for details.
+# "External Indexing and Searching" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
@ -1496,7 +1560,7 @@ SERVER_BASED_SEARCH    = NO
 # external search engine pointed to by the SEARCHENGINE_URL option to obtain the
 # search results.
 #
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
 # Xapian (see: http://xapian.org/).
 #
@ -1509,7 +1573,7 @@ EXTERNAL_SEARCH        = NO
 # The SEARCHENGINE_URL should point to a search engine hosted by a web server
 # which will return the search results when EXTERNAL_SEARCH is enabled.
 #
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
 # Xapian (see: http://xapian.org/). See the section "External Indexing and
 # Searching" for details.
@ -1547,7 +1611,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 GENERATE_LATEX         = NO
@ -1578,7 +1642,7 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@ -1596,9 +1660,12 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
+# that should be included in the LaTeX output. The package can be specified just
-# instance you can specify
+# by its name or with the correct syntax as to be used with the LaTeX
-# EXTRA_PACKAGES=times
+# \usepackage command. To get the times font for instance you can specify :
 # EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
 # To use the option intlimits with the amsmath package you can specify:
 # EXTRA_PACKAGES=[intlimits]{amsmath}
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
@ -1612,23 +1679,36 @@ EXTRA_PACKAGES         =
 #
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# replace them by respectively the title of the page, the current date and time,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# only the current date, the version number of doxygen, the project name (see
+# string, for the replacement values of the other commands the user is referred
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# to HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 LATEX_HEADER           =
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
+# chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
 # special commands can be used inside the footer.
 #
 # Note: Only use a user-defined footer if you know what you are doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 LATEX_FOOTER           =
 # The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
 # LaTeX style sheets that are included after the standard style sheets created
 # by doxygen. Using this option one can overrule certain style aspects. Doxygen
 # will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
 # list).
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 LATEX_EXTRA_STYLESHEET =
 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
 # directory. Note that the files will be copied as-is; there are no commands or
@ -1646,8 +1726,8 @@ LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = YES
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
@ -1688,11 +1768,19 @@ LATEX_SOURCE_CODE      = NO
 LATEX_BIB_STYLE        = plain
 # If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
 # page will contain the date and time when the page was generated. Setting this
 # to NO can help when comparing the output of multiple runs.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 LATEX_TIMESTAMP        = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
 # RTF output is optimized for Word 97 and may not look too pretty with other RTF
 # readers/editors.
 # The default value is: NO.
@ -1707,7 +1795,7 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
 # The default value is: NO.
@ -1744,11 +1832,21 @@ RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
 # If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
 # with syntax highlighting in the RTF output.
 #
 # Note that which sources are shown also depends on other settings such as
 # SOURCE_BROWSER.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
 #---------------------------------------------------------------------------
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
 # classes and files.
 # The default value is: NO.
@ -1772,6 +1870,13 @@ MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 # The MAN_SUBDIR tag determines the name of the directory created within
 # MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
 # MAN_EXTENSION with the initial . removed.
 # This tag requires that the tag GENERATE_MAN is set to YES.
 MAN_SUBDIR             =
 # If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
 # will generate one additional man file for each entity documented in the real
 # man page(s). These additional files only source the real man page, but without
@ -1785,7 +1890,7 @@ MAN_LINKS              = NO
 # Configuration options related to the XML output
 #---------------------------------------------------------------------------
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
 # captures the structure of the code including all documentation.
 # The default value is: NO.
@ -1799,19 +1904,7 @@ GENERATE_XML           = NO
 XML_OUTPUT             = xml
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
 # validating XML parser to check the syntax of the XML files.
 # This tag requires that the tag GENERATE_XML is set to YES.
 XML_SCHEMA             =
 # The XML_DTD tag can be used to specify a XML DTD, which can be used by a
 # validating XML parser to check the syntax of the XML files.
 # This tag requires that the tag GENERATE_XML is set to YES.
 XML_DTD                =
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 # the XML output. Note that enabling this will significantly increase the size
 # of the XML output.
@ -1824,7 +1917,7 @@ XML_PROGRAMLISTING     = YES
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
 # that can be used to generate PDF.
 # The default value is: NO.
@ -1838,14 +1931,23 @@ GENERATE_DOCBOOK       = NO
 DOCBOOK_OUTPUT         = docbook
 # If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
 # program listings (including syntax highlighting and cross-referencing
 # information) to the DOCBOOK output. Note that enabling this will significantly
 # increase the size of the DOCBOOK output.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_DOCBOOK is set to YES.
 DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# Definitions (see http://autogen.sf.net) file that captures the structure of
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# the code including all documentation. Note that this feature is still
+# structure of the code including all documentation. Note that this feature is
-# experimental and incomplete at the moment.
+# still experimental and incomplete at the moment.
 # The default value is: NO.
 GENERATE_AUTOGEN_DEF   = NO
@ -1854,7 +1956,7 @@ GENERATE_AUTOGEN_DEF   = NO
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
 # file that captures the structure of the code including all documentation.
 #
 # Note that this feature is still experimental and incomplete at the moment.
@ -1862,7 +1964,7 @@ GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
 # Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
 # output from the Perl module output.
 # The default value is: NO.
@ -1870,9 +1972,9 @@ GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
 # formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
+# understand what is going on. On the other hand, if this tag is set to NO, the
 # size of the Perl module output will be much smaller and Perl will parse it
 # just the same.
 # The default value is: YES.
@ -1892,14 +1994,14 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
 # C-preprocessor directives found in the sources and include files.
 # The default value is: YES.
 ENABLE_PREPROCESSING   = YES
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
+# in the source code. If set to NO, only conditional compilation will be
 # performed. Macro expansion can be done in a controlled way by setting
 # EXPAND_ONLY_PREDEF to YES.
 # The default value is: NO.
@ -1915,7 +2017,7 @@ MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = NO
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
 # INCLUDE_PATH will be searched if a #include is found.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
@ -1958,9 +2060,9 @@ PREDEFINED += "NAMESPACE=@PACKAGE_NAME@"
 EXPAND_AS_DEFINED      =
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
+# remove all references to function-like macros that are alone on a line, have
-# all uppercase name, and do not end with a semicolon. Such function macros are
+# an all uppercase name, and do not end with a semicolon. Such function macros
-# typically used for boiler-plate code, and will confuse the parser if not
+# are typically used for boiler-plate code, and will confuse the parser if not
 # removed.
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
@ -1980,7 +2082,7 @@ SKIP_FUNCTION_MACROS   = YES
 # where loc1 and loc2 can be relative or absolute paths or URLs. See the
 # section "Linking to external documentation" for more information about the use
 # of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
+# Note: Each tag file must have a unique name (where the name does NOT include
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
@ -1992,20 +2094,21 @@ TAGFILES               =
 GENERATE_TAGFILE       = @PACKAGE_NAME@.doxytag
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# class index. If set to NO only the inherited external classes will be listed.
+# the class index. If set to NO, only the inherited external classes will be
 # listed.
 # The default value is: NO.
 ALLEXTERNALS           = NO
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# the modules index. If set to NO, only the current project's groups will be
+# in the modules index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 EXTERNAL_GROUPS        = YES
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
 # the related pages index. If set to NO, only the current project's pages will
 # be listed.
 # The default value is: YES.
@ -2022,7 +2125,7 @@ PERL_PATH              = /usr/bin/perl
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
 # (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
 # NO turns the diagrams off. Note that this option also works with HAVE_DOT
 # disabled, but it is recommended to install and use dot, since it yields more
@ -2047,7 +2150,7 @@ MSCGEN_PATH            =
 DIA_PATH               =
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
@ -2058,7 +2161,7 @@ HIDE_UNDOC_RELATIONS   = NO
 # http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
-# The default value is: NO.
+# The default value is: YES.
 HAVE_DOT               = YES
@ -2072,7 +2175,7 @@ HAVE_DOT               = YES
 DOT_NUM_THREADS        = 0
-# When you want a differently looking font n the dot files that doxygen
+# When you want a differently looking font in the dot files that doxygen
 # generates you can specify the font name using DOT_FONTNAME. You need to make
 # sure dot is able to find the font, which can be done by putting it in a
 # standard location or by setting the DOTFONTPATH environment variable or by
@ -2120,7 +2223,7 @@ COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 # The default value is: NO.
@ -2172,7 +2275,8 @@ INCLUDED_BY_GRAPH      = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# functions only using the \callgraph command. Disabling a call graph can be
 # accomplished by means of the command \hidecallgraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
@ -2183,7 +2287,8 @@ CALL_GRAPH             = NO
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# functions only using the \callergraph command. Disabling a caller graph can be
 # accomplished by means of the command \hidecallergraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
@ -2206,11 +2311,17 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
+# generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
 # http://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
-# Possible values are: png, jpg, gif and svg.
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
 # png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
 # gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
 # png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
 # png:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
@ -2253,6 +2364,19 @@ MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
 # path where java can find the plantuml.jar file. If left blank, it is assumed
 # PlantUML is not used or called during a preprocessing step. Doxygen will
 # generate a warning when it encounters a \startuml command in this case and
 # will not generate output for the diagram.
 PLANTUML_JAR_PATH      = "@top_srcdir@/doc/plantuml.jar"
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 PLANTUML_INCLUDE_PATH  =
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, doxygen will truncate the graph, which is visualized
@ -2289,14 +2413,14 @@ MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = YES
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
 # this, this feature is disabled by default.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
-DOT_MULTI_TARGETS      = YES
+DOT_MULTI_TARGETS      = NO
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
@ -2306,7 +2430,7 @@ DOT_MULTI_TARGETS      = YES
 GENERATE_LEGEND        = YES
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
 # files that are used to generate the various graphs.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
--- a/doc/makefile.am
+++ b/doc/makefile.am
@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Sat, 30 July 2016 10:47:21 +0200
+##  -  on Sat, 04 August 2018 09:28:30 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
--- a/doc/style.css
+++ b/doc/style.css
@ -14,3 +14,25 @@
  padding: 1ex;
  margin: 0;
 }
 img, object {
  max-width: 100% !important;
 }
@media (max-width: 50em) {
  #navrow1, #navrow2 {
    display: block
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: none;
  }
  #doc-content {
    margin-left: 0 !important;
  }
 }
@media (min-width: 50em) {
  #navrow1, #navrow2 {
    display: none;
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: block
  }
 }
--- a/examples/makefile.am
+++ b/examples/makefile.am
@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Sat, 30 July 2016 10:47:21 +0200
+##  -  on Sat, 04 August 2018 10:23:26 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
@ -10,10 +10,12 @@
 AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src
 AM_LDFLAGS = -L${abs_top_builddir}/src/.libs
-#LDADD = -lmatricxx
+LDADD = -lmatricxx
 noinst_PROGRAMS = matrix-sample
 matrix_sample_SOURCES = matrix-sample.cxx
 exampledir = ${docdir}/examples
 example_DATA = matrix-sample.cxx
 MAINTAINERCLEANFILES = makefile.in
--- a/libmatricxx.spec.in
+++ b/libmatricxx.spec.in
@ -1,31 +1,38 @@
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Release: @BUILD_NUMBER@%{?dist}
+Release: @BUILD_NUMBER@.@DISTRO@
 License: LGPL
 Group: Development/Libraries/C++
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, subversion, make, automake, autoconf, rpm-build, doxygen
+BuildRequires: which, pkgconfig, gnupg, expect, git, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, cppunit-devel, doxygen, graphviz, java-openjdk  @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@
 %if 0%{?fedora} != 20
 BuildRequires: graphviz
 %endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
 BuildRequires: pkgconfig, redhat-lsb, cppunit-devel
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 BuildRequires: mscgen
 #### os dependent definitions ####
 %if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: lsb-release
 %else
-
+%if  0%{?mageia}
-%endif
+BuildRequires: rpm-sign, lsb-release
 %else%if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: pkg-config, lsb-release, libcppunit-devel
 %if 0%{?suse_version} < 1200 ||  0%{?sles_version} < 1200
 %else
 BuildRequires: rpm-sign, redhat-lsb
 %global debug_package %{nil}
 %endif
 %endif
 %if ! 0%{?centos}
 BuildRequires: mscgen
 %if ! 0%{?mageia}
 BuildRequires: pandoc
 %endif
 %endif
 %if 0%{?mageia}
 BuildRequires: libtool, libltdl-devel
 %else
 BuildRequires: libtool, libtool-ltdl-devel
 %endif
 %endif%endif
 %description
@README@
@ -51,19 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
-/usr/%_lib/@PACKAGE_NAME@.so.*
+/usr/%_lib/*.so.*
 %doc
-/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
+/usr/share/doc
 /usr/share/doc/packages/@PACKAGE_NAME@/COPYING
 /usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
 /usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
 /usr/share/doc/packages/@PACKAGE_NAME@/NEWS
 /usr/share/doc/packages/@PACKAGE_NAME@/README
 %package devel
 Summary: @DESCRIPTION@
 Group: Development/Libraries/C++
-Requires: @PACKAGE_NAME@ = @VERSION@
+Requires: @PACKAGE_NAME@ = @VERSION@ @RPM_BUILD_DEPEND@
 %description devel
@README@
@ -72,14 +75,14 @@ This Package contains all files required for developement.
 %files devel
 %defattr(-,root,root,-)
-/usr/%_lib/@PACKAGE_NAME@.so
+/usr/%_lib/*.so
-/usr/%_lib/@PACKAGE_NAME@.a
+/usr/%_lib/*.a
-/usr/%_lib/@PACKAGE_NAME@.la
+/usr/%_lib/*.la
 /usr/%_lib/pkgconfig
 /usr/include/*
 %doc
 /usr/share/@PACKAGE_NAME@
 /usr/share/doc/packages/@PACKAGE_NAME@/html
 /usr/share/doc/packages/@PACKAGE_NAME@/examples
 %changelog
--- a/mac-create-app-bundle.sh
+++ b/mac-create-app-bundle.sh
@ -7,7 +7,7 @@
 ## Parameters:
 ##  $1: name of the app-target
 ##  $2: name of the project
-##  $3: installation source
+##  $3: package installation target
 ##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
@ -16,31 +16,33 @@ if test "$(uname -s)" != "Darwin"; then
    echo "**** ERROR: run on Mac OS-X: $0"
    exit 1
 fi
-test -n "$1"
+
-test -n "$2"
+project=${2:-$(sed -n 's/ *m4_define *( *x_package_name, *\(.*\) *).*/\1/p' $(pwd)/configure.ac)}
-test -d "$3"
+apptarget=${1:-${project}.app}
-target="$(pwd)/${1}/Contents/MacOS"
+sources=${3:-$(pwd)/tmp}
 ! test -e "$apptarget" || rm -rf "$apptarget"
 test -n "$project"
 test -d "$sources"
 target="$(pwd)/${apptarget}/Contents/MacOS"
 echo "Creating $apptarget for $project from $sources"
 # Step 1: create and fill app directory structure
-mkdir -p ${1}/Contents/{Resources,MacOS}
+mkdir -p ${apptarget}/Contents/{Resources,MacOS}
-! test -d ${3}/bin || \
+! test -d ${sources}/bin || \
-     find ${3}/bin -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \;
+    find ${sources}/bin -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
-executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1)
+! test -d ${sources}/scripts || \
-! test -d ${3}/lib || \
+    find ${sources}/scripts -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
-    find ${3}/lib -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/MacOS/ \;
+executablefile=${apptarget}/Contents/MacOS/${project}
-! test -d ${3}/share/${2} || \
+test -x $executablefile || executablefile=$(ls -1 ${apptarget}/Contents/MacOS/ | head -1)
-    find ${3}/share/${2} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
+! test -d ${sources}/lib || \
-! test -d ${3}/share/${2} || rmdir ${3}/share/${2}
+    find ${sources}/lib -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/MacOS/ \;
-! test -d ${3}/share || \
+! test -d ${sources}/share/${project} || \
-    find ${3}/share -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
+    find ${sources}/share/${project} -mindepth 1 -maxdepth 1 -exec cp -a {} ${apptarget}/Contents/Resources/ \;
-! test -d ${3}/bin || rmdir ${3}/bin
+! test -d ${sources}/share || \
-! test -d ${3}/lib || rmdir ${3}/lib
+    find ${sources}/share -mindepth 1 -maxdepth 1 -name ${project} -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \;
-! test -d ${3}/share || rmdir ${3}/share
+! test -d ${sources} || \
-! test -d ${3} || \
+    find ${sources} -mindepth 1 -maxdepth 1 -name share -o -name bin -o -name lib -o -name scripts -prune -o -exec cp -a {} ${apptarget}/Contents/Resources/ \;
    find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
 ! test -d ${3}/include || rm -r ${3}/include
 ! test -d ${3} || rmdir ${3}
 ! test -d ${1}/tmp || rm -r ${1}/tmp
 # Step 2: copy qt plugins, if necessary
 for f in ${QT_PLUGINS}; do
@ -57,7 +59,7 @@ while [ $found -ne 0 ]; do
    cd "${target}"
    for file in $(find . -type f); do
        for lib in $(otool -L ${file} | tail -n +2 \
-            | egrep '/opt/local/|'"${HOME}" \
+            | egrep '/usr/local/|/opt/local/|'"${HOME}" \
            | grep -v $file | awk '{print $1}'); do
            found=1
            test -f ${lib##*/} \
@ -79,23 +81,23 @@ if test -n "${QTDIR}"; then
    MENU_NIB=$(find ${QTDIR} -name .svn -o -name .git -prune -o -name qt_menu.nib -print \
               | head -1)
    if test -e "${MENU_NIB}"; then
-        rsync -r "${MENU_NIB}" ${1}/Contents/Resources/
+        rsync -r "${MENU_NIB}" ${apptarget}/Contents/Resources/
-        test -d ${1}/Contents/Resources/qt_menu.nib
+        test -d ${apptarget}/Contents/Resources/qt_menu.nib
    fi
 fi
 # Step 5: copy or create info.plist
-infoplist=$(find ${1}/Contents/Resources -name Info.plist)
+infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist)
 if test -f "${infoplist}"; then
-    mv "${infoplist}" ${1}/Contents/Info.plist
+    cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
 else
-    cat > ${1}/Contents/Info.plist <<EOF
+    cat > ${apptarget}/Contents/Info.plist <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
  <dict>
    <key>CFBundleIdentifier</key>
-    <string>${2}</string>
+    <string>${project}</string>
    <key>CFBundleExecutable</key>
    <string>${executablefile##/}</string>
  </dict>
--- a/makefile.am
+++ b/makefile.am
@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Sat, 30 July 2016 10:47:21 +0200
+##  -  on Sat, 04 August 2018 09:28:30 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
@ -10,15 +10,21 @@
 SUBDIRS = src test doc examples
-desktopdir = ${datadir}/applications
+#desktopdir = ${datadir}/applications
-desktop_DATA = @PACKAGE_DESKTOP@
+#desktop_DATA = @PACKAGE_DESKTOP@
-dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh		\
+dist_pkgdata_DATA = @PACKAGE_ICON@
-                    resolve-rpmbuilddeps.sh autogen.sh			\
+dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\
                   resolve-rpmbuilddeps.sh autogen.sh			\
                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\
                    build-resource-file.sh				\
                    ax_init_standard_project.m4				\
                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \
                    dependency-graph.sh template.sh                     \
                    sql-to-dot.sed
-dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+dist_doc_DATA = AUTHORS NEWS README.md COPYING INSTALL ChangeLog
 README: README.md
 	cp README.md README
 CLEANFILES = README
 MAINTAINERCLEANFILES = makefile.in
--- a/resolve-debbuilddeps.sh
+++ b/resolve-debbuilddeps.sh
@ -24,7 +24,7 @@ else
 fi
 function install() {
-    if ${SUDO} apt-get -y install $*; then
+    if ${SUDO} apt-get install -y --force-yes --no-install-suggests --no-install-recommends $*; then
        return 0
    else
        return 1
--- a/resolve-rpmbuilddeps.sh
+++ b/resolve-rpmbuilddeps.sh
@ -97,12 +97,12 @@ fi
 if test -n "${SCHROOTNAME}"; then
    FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
-    if test -n "${FILES}"; then
+    if test -n "${FILES}${DEPS}"; then
        schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  ${FILES} ${DEPS}
    fi
 else
    FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
-    if test -n "${FILES}"; then
+    if test -n "${FILES}${DEPS}"; then
        ${INSTALL_TOOL} ${FILES} ${DEPS}
    fi
 fi