From 1d12107601b834332734721fac6a15cdf87db971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sat, 7 Jan 2017 11:48:59 +0000
Subject: [PATCH] updated build environment

---
 ChangeLog          | 7 +++++++
 bootstrap.sh       | 2 +-
 build-in-docker.sh | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b430e4..b9480df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-06 15:53  
+
+	* [r127] COPYING, ChangeLog, INSTALL, bootstrap.sh,
+	  build-in-docker.conf, build-in-docker.sh, debian/control.in,
+	  scripts/bootstrap.sh:
+	  improved build, tested on wily and xenial
+
 2016-12-26 12:21  
 
 	* [r126] ChangeLog, bootstrap.sh, build-in-docker.sh,
diff --git a/bootstrap.sh b/bootstrap.sh
index ae0adf8..e78eccd 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1465,7 +1465,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @PACKAGER@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(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-tools | qt4-dev-tools"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
diff --git a/build-in-docker.sh b/build-in-docker.sh
index bd4e3b6..d426c9e 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -10,8 +10,8 @@ mode="deb"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=("-e LANG=${LANG}" "-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
-dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
+envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
 packages=()
 targets="all check distcheck"
 commands=()