From fd3ebf9b62c9d0f73a9dd3105bfe5a933f63aabb Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 7 May 2021 11:48:28 -0700 Subject: build-system: build for Ubuntu 21.04 / hirsute as well This release drops the qt5-default package - which really wasn't needed since focal. So just drop it on all of the builds after 18.04 (bionic). Signed-off-by: Dirk Hohndel --- packaging/ubuntu/make-package.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index d4e55366c..e05d6fdb3 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -110,15 +110,23 @@ cp debian/changelog ../changelog$SUFFIX debuild -S -d -#create builds for the newer Ubuntu releases that Launchpad supports +# create builds for the newer Ubuntu releases that Launchpad supports +# +# the bionic release is the last that needs the qt5-default package for a successful build, +# and as of hirsute this package no longer exists. So simply remove it from the control +# file when building the newer ones +sed -i.bak "/qt5-default/d" debian/control rel=bionic -others="focal groovy" +others="focal groovy hirsute" for next in $others do sed -i "s/${rel}/${next}/g" debian/changelog debuild -S -d rel=$next done +if [ -f debian/control.bak ] ; then + mv debian/control.bak debian/control +fi cd .. -- cgit v1.2.3-70-g09d2