From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 2 Sep 2022 14:30:32 +0000 (+0200)
Subject: More robust Debian dependency installation
X-Git-Tag: v1.12.90~14^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c353e496ea99b8371ae3271fb4198b99b1be09a0;p=tigervnc.git

More robust Debian dependency installation

We want it to complain loudly if a dependency is missing, not just
quietly continue on.
---

diff --git a/.github/containers/bionic/build.sh b/.github/containers/bionic/build.sh
index 243c3f95..32c844f7 100755
--- a/.github/containers/bionic/build.sh
+++ b/.github/containers/bionic/build.sh
@@ -47,10 +47,9 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/
 	bash -e -x -c "
 	tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz;
 	cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian;
-	mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
-	sudo dpkg --unpack ~/tigervnc-build-deps_*.deb;
 	sudo apt-get update;
-	sudo apt-get -f install -y;
+	mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
+	sudo apt-get install -y ~/tigervnc-build-deps_*.deb;
 	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage;
 	"
 
diff --git a/.github/containers/focal/build.sh b/.github/containers/focal/build.sh
index 9041ca25..90ff2c4d 100755
--- a/.github/containers/focal/build.sh
+++ b/.github/containers/focal/build.sh
@@ -47,10 +47,9 @@ docker run --volume ${CURDIR}/build:/home/deb/build --interactive --rm tigervnc/
 	bash -e -x -c "
 	tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz;
 	cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian;
-	mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
-	sudo dpkg --unpack ~/tigervnc-build-deps_*.deb;
 	sudo apt-get update;
-	sudo apt-get -f install -y;
+	mk-build-deps ~/build/tigervnc-${VERSION}/debian/control;
+	sudo apt-get install -y ~/tigervnc-build-deps_*.deb;
 	cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage;
 	"