From 7072d83d3fb6029fad621859dba1ebb3e5ce81c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 6 Feb 2017 22:55:20 +0000 Subject: [PATCH] fixed debian dependencies --- COPYING | 2 +- ChangeLog | 32 ++++++++++++++++++++++++++ INSTALL | 2 +- ax_init_standard_project.m4 | 35 +++++++++++++++++++++++++++-- bootstrap.sh | 16 ++++++++----- resolve-debbuilddeps.sh | 11 +++++---- scripts/ax_init_standard_project.m4 | 30 ++++++++++++------------- scripts/bootstrap.sh | 2 +- 8 files changed, 100 insertions(+), 30 deletions(-) diff --git a/COPYING b/COPYING index 88798ab..caeca07 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.15/COPYING \ No newline at end of file +/usr/share/automake-1.14/COPYING \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 61e0bea..ff23e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2017-02-06 10:14 + + * [r134] scripts/resolve-debbuilddeps.sh: + fixed dependency resolve problem + +2017-02-02 20:03 + + * [r133] ChangeLog, bootstrap.sh, scripts/bootstrap.sh: + new list RUN_DEPENDS + +2017-02-02 16:49 + + * [r132] scripts/ax_init_standard_project.m4: + improved debian dependencies and resolve + +2017-02-02 16:27 + + * [r131] scripts/resolve-debbuilddeps.sh: + improved debian dependencies and resolve + +2017-02-02 16:06 + + * [r130] scripts/ax_init_standard_project.m4, scripts/bootstrap.sh, + scripts/resolve-debbuilddeps.sh: + improved debian dependencies + +2017-01-07 18:56 + + * [r129] bootstrap.sh, build-in-docker.conf, debian/control.in, + scripts/bootstrap.sh: + fix typo + 2017-01-07 11:48 * [r128] ChangeLog, bootstrap.sh, build-in-docker.sh: diff --git a/INSTALL b/INSTALL index ddcdb76..f812f5a 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.15/INSTALL \ No newline at end of file +/usr/share/automake-1.14/INSTALL \ No newline at end of file diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 9b78951..0f6bd80 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -968,9 +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 +]) + +# 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="${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="${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" + 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 1a9fb58..19cf7b8 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -690,9 +690,13 @@ ${CHEADER}#include <${PACKAGE_NAME}.hxx> #include #include #include +#include int main(int argc, char *argv[]) try { QApplication a(argc, argv); + a.setApplicationDisplayName(a.tr("${PACKAGE_NAME}")); + a.setApplicationName(${PACKAGE_NAME}::package_name().c_str()); + a.setApplicationVersion(${PACKAGE_NAME}::version().c_str()); QCommandLineParser parser; parser.addHelpOption(); parser.process(a); @@ -725,6 +729,7 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} { Q_OBJECT; public: explicit ${PackageName}(QWidget *parent = 0): QMainWindow(parent) { + setTitle(tr("${PACKAGE_NAME}[*]")); setupUi(this); } virtual ~${PackageName}() {} @@ -1465,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 <&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then - TO_INSTALL+=" ${f}" + DEPS+=" ${f}" fi done + for f in $(sed -n 's, *AX_DEB_BUILD_DEPEND(\([^)]*\)).*,\1,p' configure.ac); do + DEPS+=" ${f}" + done trap "rm debian/control" INT TERM EXIT - sed 's,@DEB_DEPEND_IFEXISTS@,,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 install dpkg-dev -DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true) -DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') +DEPS+=" $(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')" for pa in ${DEPS}; do if test ${pa//|/} = ${pa}; then diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4 index f1d29a0..ad245dc 100644 --- a/scripts/ax_init_standard_project.m4 +++ b/scripts/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/scripts/bootstrap.sh b/scripts/bootstrap.sh index 35647d5..ccd3856 100755 --- a/scripts/bootstrap.sh +++ b/scripts/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