diff --git a/build-in-docker.sh b/build-in-docker.sh index 7bb03ff..6373d18 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -171,6 +171,7 @@ OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew - docker pull $img DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity) trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT +docker exec -it ${DOCKER_ID} bash -c 'for f in "libpam-systemd:amd64" "policykit*" "colord"; do echo "Package: $f" >> /etc/apt/preferences; echo "Pin-Priority: -100" >> /etc/apt/preferences; echo >> /etc/apt/preferences; done' docker exec ${DOCKER_ID} apt-get update ${OPTIONS} docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS} docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \ diff --git a/debian/control.in b/debian/control.in index 660389f..9225635 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, git, nodejs, default-jdk, libc6-i386, lib32stdc++6, lib32gcc1, lib32ncurses5, lib32z1 +Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, git, nodejs, default-jre-headless, libc6-i386, lib32stdc++6, lib32gcc1, lib32ncurses5, lib32z1 Package: @PACKAGE_NAME@ Section: web