From d9754616efcf7109c78e0c9059a00d9a9b1a3787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 15 Mar 2017 08:50:43 +0000
Subject: [PATCH] fixed debian and docker build

---
 COPYING              |  2 +-
 INSTALL              |  2 +-
 build-in-docker.conf | 23 +++++++++++++++++++----
 configure.ac         |  3 +++
 debian/changelog.in  |  4 ++--
 debian/control.in    |  8 ++++----
 debian/rules         | 10 ++++++----
 7 files changed, 36 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 debian/rules

diff --git a/COPYING b/COPYING
index caeca07..88798ab 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.14/COPYING
\ No newline at end of file
+/usr/share/automake-1.15/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index f812f5a..ddcdb76 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.14/INSTALL
\ No newline at end of file
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
diff --git a/build-in-docker.conf b/build-in-docker.conf
index 692d2fd..9078790 100644
--- a/build-in-docker.conf
+++ b/build-in-docker.conf
@@ -1,4 +1,19 @@
-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")
+## @id $Id$
+##
+## This file has been added:
+##  - by bootstrap.sh
+##  -  on Wed, 15 March 2017 09:00:57 +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äckerlin'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/configure.ac b/configure.ac
index 1eafa3f..31206d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,5 +30,8 @@ AX_USE_RPM_PACKAGING
 AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 #AX_QT_NO_KEYWORDS
 
+AX_DEB_SECTION(utils)
+AX_DEB_RESOLVE
+
 # create output
 AC_OUTPUT
diff --git a/debian/changelog.in b/debian/changelog.in
index 7b10448..f461e4a 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,5 +1,5 @@
 @PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
 
-  * Please see ChangeLog of @PACKAGE@
+@DEB_CHANGELOG@
 
- -- @AUTHOR@  @BUILD_DATE@
+ -- @PACKAGER@  @BUILD_DATE@
diff --git a/debian/control.in b/debian/control.in
index 414b74c..788559d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,12 +1,12 @@
 Source: @PACKAGE_NAME@
 Priority: extra
-Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, 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
+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, 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 @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 
 Package: @PACKAGE_NAME@
-Section: utils
+Section: @DEB_SECTION@
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends} @DEB_DEPEND@
 Description: @DESCRIPTION@
 @README_DEB@
 
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index b10e7e0..0e3dcc4
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 ## @id $Id$
-#
-# This file has been added by bootstrap.sh on Thu, 08 October 2015 11:04:32 +0200
-# Feel free to change it or even remove and rebuild it, up to your needs
-#
+##
+## This file has been added:
+##  - by bootstrap.sh
+##  -  on Wed, 15 March 2017 09:00:57 +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