diff --git a/ChangeLog b/ChangeLog index 48d9f76..fca5afa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-02-02 16:51 + + * [r388] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, + build-in-docker.conf, configure.ac, debian, + debian/changelog.in[ADD], debian/compat[ADD], + debian/control.in[ADD], debian/docs[ADD], + debian/libpcscxx-dev.install[ADD], debian/libpcscxx.install[ADD], + debian/rules[ADD], resolve-debbuilddeps.sh: + build problems fixed + 2017-02-02 13:06 * [r387] debian/docs[DEL]: diff --git a/bootstrap.sh b/bootstrap.sh index 60babe8..4faac8f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1470,17 +1470,18 @@ if testtag AX_USE_DEBIAN_PACKAGING; then -- @PACKAGER@ @BUILD_DATE@ EOF + RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; 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 <