From 6304cf2dcac8fc9c87d99f66f6568afddff1d2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sun, 3 Apr 2016 16:18:31 +0000
Subject: [PATCH] after svn-server restore

---
 ChangeLog               | 7 +++++++
 build-in-docker.sh      | 3 ++-
 resolve-debbuilddeps.sh | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91add29..a0eab6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-08 13:14  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  build-in-docker.conf, build-in-docker.sh, mrw-c++.desktop.in,
+	  resolve-debbuilddeps.sh, sql-to-dot.sed, src/version.cxx,
+	  src/version.cxx.in: build in docker for all debian based distros
+
 2015-11-16 12:38  marc
 
 	* doc/doxyfile.in: SVG must not be interactive for embedding in
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 6baaa8a..fc13547 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -113,6 +113,7 @@ function traperror() {
                 fi
                 echo
             fi
+            echo "**** Entering docker container ${DOCKER_ID}, exit with Ctrl-D"
             echo -n "   ... cleanup docker: "
             docker rm -f "${DOCKER_ID}"
             echo "returning status: $e"
@@ -162,7 +163,7 @@ for repo in "${repos[@]}"; do
     ifthenelse "${repo}" "apt-add-repository ARG"
 done
 for key in "${keys[@]}"; do
-    wget -O-  \
+    wget -O- "$key" \
         | docker exec -i ${DOCKER_ID} apt-key add -
 done
 docker exec ${DOCKER_ID} apt-get update
diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh
index 47ab970..1fd672c 100755
--- a/resolve-debbuilddeps.sh
+++ b/resolve-debbuilddeps.sh
@@ -35,7 +35,7 @@ TO_INSTALL=
 
 if test -e debian/control.in -a ! -e debian/control; then
     for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
-        if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
+        if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then
             TO_INSTALL+=" ${f}"
         fi
     done
@@ -45,7 +45,7 @@ if test -e debian/control.in -a ! -e debian/control; then
 fi
 
 install dpkg-dev
-DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true)
+DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true)
 DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
 
 for pa in ${DEPS}; do