diff --git a/ChangeLog b/ChangeLog index e362ce1..b65d9be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-04-24 16:20 + + * ChangeLog, autogen.sh, ax_init_standard_project.m4, bootstrap.sh, + build-in-docker.sh, mac-create-app-bundle.sh, + resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, + src/version.cxx, src/version.hxx: fix build error + 2015-11-28 13:48 marc * ChangeLog, ax_init_standard_project.m4, bootstrap.sh, diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index e10d6bd..f487c68 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -14,6 +14,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" for path in . .. ../.. ../../..; do if test -d .svn; then + svn upgrade 1>&2 > /dev/null || true VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') if test -n "${VCS_REVISION}"; then break; fi elif test -d .git; then @@ -26,6 +27,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix], VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" for path in . .. ../.. ../../..; do if test -d .svn; then + svn upgrade 1>&2 > /dev/null || true VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') if test -n "${VCS_REVISION}"; then break; fi elif test -d .git; then @@ -46,6 +48,7 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([ VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout" for path in . .. ../.. ../../..; do if test -d .svn; then + svn upgrade 1>&2 > /dev/null || true VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p') if test -n "${VCS_REVISION}"; then break; fi elif test -d .git; then diff --git a/build-in-docker.sh b/build-in-docker.sh index 27e9f78..8bca39c 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -189,9 +189,9 @@ case $mode in (apt) OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do - docker exec -it ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" - docker exec -it ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" - docker exec -it ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" + docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" + docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences" + docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences" done docker exec ${DOCKER_ID} apt-get update ${OPTIONS} docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}