From dda095e281e6f0d6e2a35f1f8796c7d2577704cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 9 Nov 2015 13:26:26 +0000 Subject: [PATCH] fixed build dependencies --- ChangeLog | 12 ++++++++++++ ax_init_standard_project.m4 | 5 ++++- bootstrap.sh | 19 ++++++++++++++++--- debian/control.in | 4 ++-- resolve-debbuilddeps.sh | 29 +++++++++++++---------------- 5 files changed, 47 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5674325..6fdac99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2015-11-07 10:47 marc + + * bootstrap.sh, debian/control.in: there is no qt4-default + +2015-11-07 09:23 marc + + * bootstrap.sh, debian/control.in: there is no qt4-default + +2015-11-06 23:45 marc + + * ChangeLog, debian/control.in: updated author with new homepage + 2015-11-05 16:02 marc * bootstrap.sh, debian/control.in: dependencies fixed diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index eef210e..01404ac 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -13,6 +13,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([ for path in . .. ../..; do if svn info $path 2>&1 > /dev/null; then SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') + if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi break; fi done @@ -22,6 +23,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([ for path in . .. ../..; do if svn info $path 2>&1 > /dev/null; then SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') + if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi break; fi done @@ -36,6 +38,7 @@ m4_define(x_minor_diff, mrw_esyscmd_s([ for path in . .. ../..; do if svn info $path 2>&1 > /dev/null; then SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') + if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi break; fi; done @@ -342,7 +345,7 @@ EOF # use this in configure.ac to support debian packages AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [ - README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') + README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g') AC_SUBST(README_DEB) _AM_SUBST_NOTMAKE([README_DEB]) AC_CONFIG_FILES([debian/changelog debian/control]) diff --git a/bootstrap.sh b/bootstrap.sh index 03d59d3..22ceaf9 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -373,7 +373,14 @@ copy() { # file already exists and must not be rebuilt return fi - run cp "${0%/*}/$1" "$1" + local source="${0%/*}/$1" + if ! test -r "${source}"; then + source="../${source}" + if ! test -r "${source}"; then + source="${0%/*}/$1" + fi + fi + run cp "${source}" "$1" if test $exists -eq 0; then run svn add "$1" run svn propset svn:keywords "Id" "$1" @@ -402,6 +409,12 @@ doxyadd() { fi } +# Check if we are in subversion root, if so, create trunk, branches, tags: +if test "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then + svn mkdir trunk branches tags + cd trunk +fi + # Initialize the environment: copy ${MY_NAME} copy ax_init_standard_project.m4 @@ -791,7 +804,7 @@ if testtag AX_USE_DOXYGEN; then doxyreplace EXAMPLE_PATH @top_srcdir@/examples fi doxyreplace EXAMPLE_RECURSIVE YES - doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed' + doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql2dot.sed' doxyreplace SOURCE_BROWSER YES doxyreplace INLINE_SOURCES YES doxyreplace GENERATE_TESTLIST YES @@ -822,7 +835,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then -- @AUTHOR@ @BUILD_DATE@ EOF - BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | 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)" + BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 < debian/control fi -if test -n "${SCHROOTNAME}"; then - schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev - DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) -else - apt-get -y install dpkg-dev - DEPS=$(dpkg-checkbuilddeps 2>&1 || true) -fi +install dpkg-dev +DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true) DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') for pa in ${DEPS}; do