From 9b1ad400c6c83a36cb7f41e5695f16eb4411f73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 6 Jan 2017 15:53:08 +0000
Subject: [PATCH] improved build, tested on wily and xenial

---
 COPYING              |  2 +-
 ChangeLog            |  7 +++++++
 INSTALL              |  2 +-
 bootstrap.sh         | 13 +++++++++----
 build-in-docker.conf | 18 ++++++++++++++++++
 build-in-docker.sh   |  4 ++--
 debian/control.in    |  6 +++---
 scripts/bootstrap.sh | 15 ++++++++++-----
 8 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/COPYING b/COPYING
index 2fcb217..88798ab 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.13/COPYING
\ No newline at end of file
+/usr/share/automake-1.15/COPYING
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 7dcd9ba..7b430e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-26 12:21  
+
+	* [r126] ChangeLog, bootstrap.sh, build-in-docker.sh,
+	  debian/control.in, scripts/bootstrap.sh,
+	  scripts/build-in-docker.sh:
+	  fixed rpm and deb build
+
 2016-12-23 14:48  
 
 	* [r125] build-in-docker.sh, scripts/bootstrap.sh,
diff --git a/INSTALL b/INSTALL
index 8b641e3..ddcdb76 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.13/INSTALL
\ No newline at end of file
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index cff28bc..ae0adf8 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1738,10 +1738,15 @@ Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
 to build-in-docker.conf <<EOF
-repos+=("Debian|Ubuntu-precise::::::universe")
-repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
-envs+=("-e 'HOME=\${HOME}'")
-dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
+${HEADER}# Use Ubuntu Universe Repository
+repos+=("Ubuntu:::universe")
+
+# Use Marc Wäckselin's Repository, see https://dev.marc.waeckerlin.org
+repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
+repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
+repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
+repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
+keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
 EOF
 
 #### Cleanup If Makefile Exists ####
diff --git a/build-in-docker.conf b/build-in-docker.conf
index 65e4815..ed6b71e 100644
--- a/build-in-docker.conf
+++ b/build-in-docker.conf
@@ -1 +1,19 @@
+## @id $Id$
+##
+## This file has been added:
+##  - by bootstrap.sh
+##  -  on Fri, 06 January 2017 16:36:33 +0100
+## Feel free to change it or even remove and rebuild it, up to your needs
+##
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+# Use Ubuntu Universe Repository
 repos+=("Ubuntu:::universe")
+
+# Use Marc Wäckselin's Repository, see https://dev.marc.waeckerlin.org
+repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
+repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
+repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
+repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
+keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
diff --git a/build-in-docker.sh b/build-in-docker.sh
index d426c9e..bd4e3b6 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}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
-dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
+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")
 packages=()
 targets="all check distcheck"
 commands=()
diff --git a/debian/control.in b/debian/control.in
index 8681209..fdb884f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,10 +1,10 @@
 Source: @PACKAGE_NAME@
 Priority: extra
-Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, default-jre-headless|default-jre
+Maintainer: @PACKAGER@
+Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, , doxygen, graphviz, mscgen, default-jre-headless|default-jre
 
 Package: @PACKAGE_NAME@
-Section: development
+Section: 
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: @DESCRIPTION@
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index e738ab6..0f8279b 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/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
@@ -1738,10 +1738,15 @@ Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
 to build-in-docker.conf <<EOF
-repos+=("Debian|Ubuntu-precise::::::universe")
-repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
-envs+=("-e 'HOME=\${HOME}'")
-dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
+${HEADER}# Use Ubuntu Universe Repository
+repos+=("Ubuntu:::universe")
+
+# Use Marc Wäckselin's Repository, see https://dev.marc.waeckerlin.org
+repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
+repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
+repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
+repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
+keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
 EOF
 
 #### Cleanup If Makefile Exists ####