From dc7d56532ce79d75e571425b92c0c06d16bc85f0 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Mon, 8 Jun 2020 17:41:30 +0200 Subject: [PATCH 1/3] debian: Trim build dependencies dpkg-dev is not needed for building binaries. make, g++ and libc6-dev will be pulled in by e.g. build-essential which is not necessary to specify (Debian policy). Packages should not build-depend on qt5-default but rather on qt5-base-dev and select QT5 in debian/rules (https://wiki.debian.org/Lintian/Tags/depends-on-metapackage) qtdeclarative5-dev is simply not needed. qttools5-dev-tools is needed for translations using lrelease. Signed-off-by: Tormod Volden --- distributions/debian/control | 7 +------ distributions/debian/rules | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/distributions/debian/control b/distributions/debian/control index 9f198a9c..78a4d291 100644 --- a/distributions/debian/control +++ b/distributions/debian/control @@ -4,13 +4,8 @@ Priority: optional Maintainer: "Marc Landolt jr" Build-Depends: debhelper (>= 9), - dpkg-dev, - g++, - libc6-dev | libc-dev, libjack-jackd2-dev, - make, - qt5-default, - qtdeclarative5-dev, + qtbase5-dev, qttools5-dev-tools, Standards-Version: 3.9.5 Homepage: http://llcon.sourceforge.net/ diff --git a/distributions/debian/rules b/distributions/debian/rules index 2cf5eb13..03a8bdb8 100755 --- a/distributions/debian/rules +++ b/distributions/debian/rules @@ -1,4 +1,7 @@ #!/usr/bin/make -f + +export QT_SELECT=qt5 + %: dh $@ From aa2914d56de485a954a8df78a9eb731e201bfd93 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Tue, 9 Jun 2020 23:50:03 +0200 Subject: [PATCH 2/3] debian: Bump Standards-Version to Ubuntu 16.04 level Avoid last remaining Lintian warning there. Signed-off-by: Tormod Volden --- distributions/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/debian/control b/distributions/debian/control index 78a4d291..77bd912b 100644 --- a/distributions/debian/control +++ b/distributions/debian/control @@ -7,7 +7,7 @@ Build-Depends: libjack-jackd2-dev, qtbase5-dev, qttools5-dev-tools, -Standards-Version: 3.9.5 +Standards-Version: 3.9.7 Homepage: http://llcon.sourceforge.net/ Vcs-Git: git://github.com/corrados/jamulus.git Vcs-Browser: https://github.com/corrados/jamulus From 4e5df07721b233998914bbbfb1b3b94fccaf25c3 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Tue, 9 Jun 2020 21:36:14 +0200 Subject: [PATCH 3/3] Update convenience build script for Debian - Port to Bourne shell - Improve text about binary compatibility - Install needed dependencies (see debian/control) - Only build binary packages Signed-off-by: Tormod Volden --- distributions/build-debian-package.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/distributions/build-debian-package.sh b/distributions/build-debian-package.sh index 4bbb1901..98e6f4c3 100755 --- a/distributions/build-debian-package.sh +++ b/distributions/build-debian-package.sh @@ -1,16 +1,19 @@ -#!/bin/bash -red="\e[91m" -default="\e[39m" -echo Today \(2019-05-27\) it is maybe best to build the .deb it on Ubuntu 16.04 -echo Since there are no versions specified of the libraries it will takte current -echo so it would also run on Ubuntu 17,18,19 or Debian 9/10 -echo -e ${red}press a [KEY] to continue or [CTRL]-C to abort${default} -read -n 1 +#!/bin/sh -e -sudo apt-get install devscripts build-essential lintian dh-make -sudo apt-get install qtdeclarative5-dev qt5-default libjack-jackd2-dev +red="\033[91m" +default="\033[39m" + +echo It can be preferential to build the binary packages on a Ubuntu 16.04 +echo system since there are no specific library version dependencies.The +echo resulting packages will run on Ubuntu 17/18/19/20 or Debian 9/10. +echo +echo ${red}Press [ENTER] to continue or [CTRL]-C to abort${default} +read dummy + +sudo apt-get install devscripts build-essential \ + debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools mv debian .. cd .. -debuild -us -uc +debuild -b -us -uc mv debian distributions