diff --git a/ChangeLog b/ChangeLog index 7779997..7ab9137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-02-03 15:51 + + * [r11] COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4, + bootstrap.sh, build-in-docker.conf, build-in-docker.sh, + configure.ac, debian, debian/changelog.in[ADD], + debian/compat[ADD], debian/control.in[ADD], debian/docs[ADD], + debian/rules[ADD], resolve-debbuilddeps.sh, + resolve-rpmbuilddeps.sh, src/tokentool.hxx: + updated to qt5 with more information than ever before + 2016-11-11 13:38 * [r10] COPYING, ChangeLog, INSTALL, autogen.sh[ADD], diff --git a/configure.ac b/configure.ac index 8c99d0d..0f7a2a8 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AX_USE_RPM_PACKAGING AX_PKG_REQUIRE(libpcscxx) AX_DEB_BUILD_DEPEND(libpcscxx-dev) +AX_DEB_RESOLVE # qt features, uncomment, what you need: #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh index 60313b4..30b0a5d 100755 --- a/resolve-debbuilddeps.sh +++ b/resolve-debbuilddeps.sh @@ -44,7 +44,7 @@ if test -e debian/control.in -a ! -e debian/control; then DEPS+=" ${f}" done trap "rm debian/control" INT TERM EXIT - sed 's,@\(DEB_DEPEND_IFEXISTS\|AX_DEB_BUILD_DEPEND\|AX_DEB_DEPEND\)@,,g' debian/control.in | \ + sed 's,@\(DEB_DEPEND_IFEXISTS\|DEB_BUILD_DEPEND\|DEB_DEPEND\)@,,g' debian/control.in | \ sed 's,@[^@]*@, dummytext,g' > debian/control fi