From 2b315721571f1a73b5de4d21d8101b4db4d32c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 6 Feb 2017 22:52:27 +0000
Subject: [PATCH] fixed debian dependencies

---
 COPYING                     |  2 +-
 ChangeLog                   |  5 +++++
 INSTALL                     |  2 +-
 ax_init_standard_project.m4 | 30 ++++++++++++++----------------
 bootstrap.sh                |  2 +-
 configure.ac                |  4 ++--
 debian/control.in           |  2 +-
 7 files changed, 25 insertions(+), 22 deletions(-)

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/ChangeLog b/ChangeLog
index 8d225bf..41658c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-06 10:14  
+
+	* [r391] ChangeLog, resolve-debbuilddeps.sh:
+	  fixed dependency resolve problem
+
 2017-02-03 20:42  
 
 	* [r390] ChangeLog:
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/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index f1d29a0..ad245dc 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -167,12 +167,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
-  DEB_DEPEND_IFEXISTS=
-  DEB_BUILD_DEPEND=
-  DEB_DEPEND=
-  AC_SUBST(DEB_DEPEND_IFEXISTS)
-  AC_SUBST(DEB_BUILD_DEPEND)
-  AC_SUBST(DEB_DEPEND)
   if test -f README.md; then
     README=$(tail -n +3 README.md)
     DESCRIPTION=$(head -1 README.md)
@@ -974,36 +968,40 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
-  pkg=$1
+  pkg="$1"
   if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
-     DEB_DEPEND_IFEXISTS+=", ${pkg}"
+     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
   fi
-  AC_SUBST(DEB_DEPEND_IFEXISTS)
 ])
 
 # require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_BUILD_DEPEND], [
-  pkg=$1
-  DEB_BUILD_DEPEND+=", ${pkg}"
-  AC_SUBST(DEB_BUILD_DEPEND)
+  pkg="$1"
+  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
 ])
 
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND], [
-  pkg=$1
-  DEB_DEPEND+=", ${pkg}"
-  AC_SUBST(DEB_DEPEND)
+  pkg="$1"
+  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
 ])
 
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_SECTION], [
-  pkg=$1
+  pkg="$1"
   DEB_SECTION="${pkg}"
+])
+
+# call after setting debian dependencies
+AC_DEFUN([AX_DEB_RESOLVE], [
+  AC_SUBST(DEB_BUILD_DEPEND)
+  AC_SUBST(DEB_DEPEND)
   AC_SUBST(DEB_SECTION)
+  AC_SUBST(DEB_DEPEND_IFEXISTS)
 ])
diff --git a/bootstrap.sh b/bootstrap.sh
index 4faac8f..19cf7b8 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1490,7 +1490,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_DEPEND@ @DEB_DEPEND_IFEXISTS@
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_DEPEND@ @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
diff --git a/configure.ac b/configure.ac
index 7fcbb37..bbfe7ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,9 @@ AX_CHECK_QT([QTGUI], [QtCore QtGui], [QtWidgets])
 AX_CHECK_QT([QTNETWORK], [Qt5Network >= 5.2])
 CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
 
+AX_DEB_BUILD_DEPEND(libpkcs11-helper1-dev|libp11-kit-dev)
 AX_DEB_BUILD_DEPEND(mrw-c++-dev)
-AX_DEB_DEPEND_IFEXISTS(libpkcs11-helper1-dev)
-AX_DEB_DEPEND_IFEXISTS(libp11-kit-dev)
+AX_DEB_RESOLVE
 
 # libraries used
 if test -z "$MINGW"; then
diff --git a/debian/control.in b/debian/control.in
index 88c4d76..1ccb9d1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,6 +13,6 @@ Description: @DESCRIPTION@
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= ${binary:Version}), 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_DEPEND@ @DEB_DEPEND_IFEXISTS@
+Depends: @PACKAGE_NAME@ (= ${binary:Version}), 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_DEPEND@ @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@