diff --git a/ChangeLog b/ChangeLog
index 17fb1e1..f5f93e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2015-11-05 15:59  marc
+
+	* README, scripts/ax_init_standard_project.m4,
+	  scripts/bootstrap.sh: some more improvements plus creation of
+	  trunk branches and tags
+
+2015-11-05 09:47  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  build-in-docker.sh, resolve-debbuilddeps.sh: updated build system
+
+2015-11-04 10:36  marc
+
+	* scripts/bootstrap.sh, scripts/build-in-docker.sh,
+	  scripts/makefile.am, scripts/resolve-debbuilddeps.sh: new feature
+	  ./build-in-docker.sh to start a temporary ubuntu docker container
+	  where the project is built and tested in$
+
+2015-11-04 08:52  marc
+
+	* README, bootstrap.sh, scripts/ax_init_standard_project.m4,
+	  scripts/bootstrap.sh: the new tag AX_BUILD_TEST allows to use
+	  tests without the need of AX_USE_CPPUNIT, so only AX_BUILD_TEST
+	  can be used for testing scripts. AX_USE_CPPUNIT calls
+	  AX_BUILD_TEST, so you don't need to specify both
+
 2015-11-03 23:01  marc
 
 	* debian/control.in: set section
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index eef210e..01404ac 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -13,6 +13,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
       break;
     fi
   done
@@ -22,6 +23,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
       break;
     fi
   done
@@ -36,6 +38,7 @@ m4_define(x_minor_diff, mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
       break;
     fi;
   done
@@ -342,7 +345,7 @@ EOF
 
 # use this in configure.ac to support debian packages
 AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
-  README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')
+  README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
   AC_SUBST(README_DEB)
   _AM_SUBST_NOTMAKE([README_DEB])
   AC_CONFIG_FILES([debian/changelog debian/control])
diff --git a/bootstrap.sh b/bootstrap.sh
index 9a76cde..31aa8b4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -120,7 +120,7 @@ GENERATED FILES
     * src/version.hxx - if you enabled AX_USE_CXX
     * src/version.cxx - if you enabled AX_USE_CXX
     * html/makefile.am - if you enabled AX_BUILD_HTML
-    * scripts/makefile.in - if you enabled AX_USE_SCRIPTS
+    * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
     * doc/makefile.am - if you enabled AX_USE_DOXYGEN
     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
     * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
@@ -332,7 +332,7 @@ to() {
         case "$1" in
             (--condition) shift # test for a tag, abort if not set
                 if ! testtag "$1"; then
-                    return
+                    return 0
                 fi;;
             (--mode) shift # test for a tag, abort if not set
                 mode="$1";;
@@ -373,7 +373,14 @@ copy() {
         # file already exists and must not be rebuilt
         return
     fi
-    run cp "${0%/*}/$1" "$1"
+    local source="${0%/*}/$1"
+    if ! test -r "${source}"; then
+        source="../${source}"
+        if ! test -r "${source}"; then
+            source="${0%/*}/$1"
+        fi
+    fi
+    run cp "${source}" "$1"
     if test $exists -eq 0; then
         run svn add "$1"
         run svn propset svn:keywords "Id" "$1"
@@ -402,6 +409,12 @@ doxyadd() {
     fi
 }
 
+# Check if we are in subversion root, if so, create trunk, branches, tags:
+if test "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then
+    svn mkdir trunk branches tags
+    cd trunk
+fi
+
 # Initialize the environment:
 copy ${MY_NAME}
 copy ax_init_standard_project.m4
@@ -427,8 +440,7 @@ ${DEFAULT_PROJECT_NAME}
 
 add description for ${DEFAULT_PROJECT_NAME}
 EOF
-to configure.ac <<EOF && \
-    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
+to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
 ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
 m4_define(x_major, 0) # project's major version
 m4_define(x_minor, 0) # project's minor version
@@ -700,7 +712,11 @@ namespace NAMESPACE {
   const std::string IDENT("\$Id: " PACKAGE_STRING);
 }
 EOF
-echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
+to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
+${HEADER}dist_bin_SCRIPTS =
+
+MAINTAINERCLEANFILES = makefile.in
+EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
@@ -819,12 +835,12 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default | 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, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default, 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)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: ${BUILD-DEPENDS}
+Build-Depends: ${BUILD_DEPENDS}
 
 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
@@ -838,7 +854,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
@@ -983,8 +999,28 @@ fi)
 
 EOF
 SUBDIRS=""
+if testtag AX_USE_CXX; then
+    SUBDIRS="${SUBDIRS} src"
+fi
+if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
+    SUBDIRS="${SUBDIRS} test"
+fi
+if testtag AX_USE_SCRIPTS; then
+    SUBDIRS="${SUBDIRS} scripts"
+fi
+if testtag AX_USE_DOXYGEN; then
+    SUBDIRS="${SUBDIRS} doc"
+fi
+if testtag AX_BUILD_EXAMPLES; then
+    SUBDIRS="${SUBDIRS} examples"
+fi
+if testtag AX_BUILD_HTML; then
+    SUBDIRS="${SUBDIRS} html"
+fi
 for d in src test scripts doc examples html; do
-    test -d $d && SUBDIRS="${SUBDIRS} $d"
+    if test -d "$d" -a "${SUBDIRS//$d/}" = "${SUBDIRS}"; then
+        SUBDIRS="${SUBDIRS} $d"
+    fi
 done
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index 826d0ca..f475e4f 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -345,7 +345,7 @@ EOF
 
 # use this in configure.ac to support debian packages
 AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
-  README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')
+  README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
   AC_SUBST(README_DEB)
   _AM_SUBST_NOTMAKE([README_DEB])
   AC_CONFIG_FILES([debian/changelog debian/control])
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index ad97bb1..76f7066 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -835,7 +835,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default | 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, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default, 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)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra