diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index e18ae6084f..b74e6e9914 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -5,7 +5,12 @@ # set armhf #sudo dpkg --add-architecture armhf -cp -r debian .. +if [ "${1}" = "headless" ]; then + cp -r debian-headless ../debian +else + cp -r debian-gui ../debian +fi + cd .. # get the jamulus version from pro file @@ -13,19 +18,11 @@ VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') # patch changelog (with hack) -DATE=$(date "+%a, %d %b %Y %T" ) -echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" > debian/changelog -echo "" >> debian/changelog -perl .github/actions_scripts/getChangelog.pl ChangeLog ${VERSION} >> debian/changelog -echo "" >> debian/changelog -echo " -- GitHubActions ${DATE} +0001" >> debian/changelog -echo "" >> debian/changelog -cat distributions/debian/changelog >> debian/changelog - +CHANGELOGCONTENT="$(perl .github/actions_scripts/getChangelog.pl ChangeLog ${VERSION})" +dch "${CHANGELOGCONTENT}" -v "${VERSION}" # patch the control file # cp the modified control file here -cp distributions/autobuilddeb/control debian/control echo "${VERSION} building..." diff --git a/distributions/debian/changelog b/distributions/debian-gui/changelog similarity index 100% rename from distributions/debian/changelog rename to distributions/debian-gui/changelog diff --git a/distributions/debian/compat b/distributions/debian-gui/compat similarity index 100% rename from distributions/debian/compat rename to distributions/debian-gui/compat diff --git a/distributions/autobuilddeb/control b/distributions/debian-gui/control similarity index 53% rename from distributions/autobuilddeb/control rename to distributions/debian-gui/control index 49186cd924..2153fc927b 100644 --- a/distributions/autobuilddeb/control +++ b/distributions/debian-gui/control @@ -1,7 +1,7 @@ Source: jamulus Section: sound Priority: optional -Maintainer: "corrados" +Maintainer: "JamulusSoftware" Build-Depends: debhelper (>= 9), libjack-jackd2-dev, @@ -9,8 +9,8 @@ Build-Depends: qttools5-dev-tools, Standards-Version: é&%JAMVERSION%&è Homepage: https://jamulus.io -Vcs-Git: git://github.com/corrados/jamulus.git -Vcs-Browser: https://github.com/corrados/jamulus +Vcs-Git: git://github.com/jamulussoftware/jamulus.git +Vcs-Browser: https://github.com/jamulussoftware/jamulus Package: jamulus Architecture: any @@ -23,17 +23,3 @@ Description: Low latency Audio Server/Client sends the mix back to each client. . It runs on Windows / macOS / Linux. - -Package: jamulus-headless -Architecture: any -Depends: libqt5core5a (>= 5.5.0), libqt5network5 (>= 5.0.2), libqt5xml5 (>= 5.0.2) -Description: Low latency Audio Server (headless) - The Jamulus software enables musicians to perform real-time jam sessions over - the internet. There is one server running the Jamulus server software which - collects the audio data from each Jamulus client, mixes the audio data and - sends the mix back to each client. - . - It runs on Windows / macOS / Linux. - . - This package contains a Jamulus binary built for headless operation - (without GUI library dependencies) and a jamulus-headless systemd service. diff --git a/distributions/debian/copyright b/distributions/debian-gui/copyright similarity index 100% rename from distributions/debian/copyright rename to distributions/debian-gui/copyright diff --git a/distributions/debian/jamulus.install b/distributions/debian-gui/jamulus.install similarity index 100% rename from distributions/debian/jamulus.install rename to distributions/debian-gui/jamulus.install diff --git a/distributions/debian-gui/rules b/distributions/debian-gui/rules new file mode 100755 index 0000000000..243e70267f --- /dev/null +++ b/distributions/debian-gui/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f + +export QT_SELECT=qt5 + +%: + dh $@ + +override_dh_auto_configure: + mkdir -p build && cd build && qmake "CONFIG+=noupcasename" PREFIX=/usr ../Jamulus.pro + +override_dh_auto_build: + cd src/res/translation && lrelease *.ts + cd build && make + +override_dh_auto_install: + cd build && make install INSTALL_ROOT=../debian/tmp + +override_dh_auto_clean: + rm -rf build + dh_clean diff --git a/distributions/debian/source/format b/distributions/debian-gui/source/format similarity index 100% rename from distributions/debian/source/format rename to distributions/debian-gui/source/format diff --git a/distributions/debian/watch b/distributions/debian-gui/watch similarity index 77% rename from distributions/debian/watch rename to distributions/debian-gui/watch index 39d4a1feb0..36aab69901 100644 --- a/distributions/debian/watch +++ b/distributions/debian-gui/watch @@ -1,5 +1,5 @@ version=4 # GitHub hosted projects opts=uversionmangle=s%_%.%g,filenamemangle=s%(?:.*?)?(r\d[\d_]*)\.tar\.gz%@PACKAGE@-$1.tar.gz% \ - https://github.com/corrados/jamulus/tags \ + https://github.com/jamulussoftware/jamulus/tags \ (?:.*?/)?r(\d[\d_]*)\.tar\.gz debian uupdate diff --git a/distributions/debian-headless/changelog b/distributions/debian-headless/changelog new file mode 100644 index 0000000000..1d240b8cb7 --- /dev/null +++ b/distributions/debian-headless/changelog @@ -0,0 +1,5 @@ +jamulus (3.5.10~git-0) UNRELEASED; urgency=medium + + * Initial release. + + -- marc Sun, 26 May 2019 13:11:40 +0200 diff --git a/distributions/debian-headless/compat b/distributions/debian-headless/compat new file mode 100644 index 0000000000..ec635144f6 --- /dev/null +++ b/distributions/debian-headless/compat @@ -0,0 +1 @@ +9 diff --git a/distributions/debian-headless/control b/distributions/debian-headless/control new file mode 100644 index 0000000000..7f0d27c4a5 --- /dev/null +++ b/distributions/debian-headless/control @@ -0,0 +1,27 @@ +Source: jamulus +Section: sound +Priority: optional +Maintainer: "JamulusSoftware" +Build-Depends: + debhelper (>= 9), + libjack-jackd2-dev, + qtbase5-dev, + qttools5-dev-tools, +Standards-Version: é&%JAMVERSION%&è +Homepage: https://jamulus.io +Vcs-Git: git://github.com/jamulussoftware/jamulus.git +Vcs-Browser: https://github.com/jamulussoftware/jamulus + +Package: jamulus-headless +Architecture: any +Depends: libqt5core5a (>= 5.5.0), libqt5network5 (>= 5.0.2), libqt5xml5 (>= 5.0.2) +Description: Low latency Audio Server (headless) + The Jamulus software enables musicians to perform real-time jam sessions over + the internet. There is one server running the Jamulus server software which + collects the audio data from each Jamulus client, mixes the audio data and + sends the mix back to each client. + . + It runs on Windows / macOS / Linux. + . + This package contains a Jamulus binary built for headless operation + (without GUI library dependencies) and a jamulus-headless systemd service. diff --git a/distributions/debian-headless/copyright b/distributions/debian-headless/copyright new file mode 100644 index 0000000000..da04281b8b --- /dev/null +++ b/distributions/debian-headless/copyright @@ -0,0 +1,32 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Jamulus +Upstream-Contact: The Jamulus development team +Source: https://github.com/jamulussoftware/jamulus/ + +Files: * +Copyright: 2004-2020 Volker Fischer +License: GPL-2 + +Files: debian/* +Copyright: + 2020 Tormod Volden + 2020 Olivier Humbert + 2019 Marc Landolt jr +License: GPL-2 + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +Comment: + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/distributions/debian/jamulus-headless.install b/distributions/debian-headless/jamulus-headless.install similarity index 100% rename from distributions/debian/jamulus-headless.install rename to distributions/debian-headless/jamulus-headless.install diff --git a/distributions/debian/jamulus-headless.postinst b/distributions/debian-headless/jamulus-headless.postinst similarity index 100% rename from distributions/debian/jamulus-headless.postinst rename to distributions/debian-headless/jamulus-headless.postinst diff --git a/distributions/debian/jamulus-headless.service b/distributions/debian-headless/jamulus-headless.service similarity index 100% rename from distributions/debian/jamulus-headless.service rename to distributions/debian-headless/jamulus-headless.service diff --git a/distributions/debian-headless/rules b/distributions/debian-headless/rules new file mode 100755 index 0000000000..bf8eb6db23 --- /dev/null +++ b/distributions/debian-headless/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f + +export QT_SELECT=qt5 + +%: + dh $@ + +override_dh_auto_configure: + mkdir -p build && cd build && qmake "CONFIG+=nosound headless" TARGET=jamulus-headless PREFIX=/usr ../Jamulus.pro + +override_dh_auto_build: + cd src/res/translation && lrelease *.ts + cd build && make + +override_dh_auto_install: + cd build && make install INSTALL_ROOT=../debian/tmp + +override_dh_auto_clean: + rm -rf build + dh_clean diff --git a/distributions/debian-headless/source/format b/distributions/debian-headless/source/format new file mode 100644 index 0000000000..163aaf8d82 --- /dev/null +++ b/distributions/debian-headless/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/distributions/debian-headless/watch b/distributions/debian-headless/watch new file mode 100644 index 0000000000..36aab69901 --- /dev/null +++ b/distributions/debian-headless/watch @@ -0,0 +1,5 @@ +version=4 +# GitHub hosted projects +opts=uversionmangle=s%_%.%g,filenamemangle=s%(?:.*?)?(r\d[\d_]*)\.tar\.gz%@PACKAGE@-$1.tar.gz% \ + https://github.com/jamulussoftware/jamulus/tags \ + (?:.*?/)?r(\d[\d_]*)\.tar\.gz debian uupdate diff --git a/distributions/debian/control b/distributions/debian/control deleted file mode 100644 index 7f34dc3051..0000000000 --- a/distributions/debian/control +++ /dev/null @@ -1,43 +0,0 @@ -Source: jamulus -Section: sound -Priority: optional -Maintainer: "Marc Landolt jr" -Build-Depends: - debhelper (>= 9), - libjack-jackd2-dev, - qtbase5-dev, - qttools5-dev-tools, -Standards-Version: 3.9.7 -Homepage: https://jamulus.io -Vcs-Git: git://github.com/corrados/jamulus.git -Vcs-Browser: https://github.com/corrados/jamulus - -Package: jamulus -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, -Description: Low latency Audio Server/Client - The Jamulus software enables musicians to perform real-time jam sessions over - the internet. There is one server running the Jamulus server software which - collects the audio data from each Jamulus client, mixes the audio data and - sends the mix back to each client. - . - It runs on Windows / OSX / Linux. - -Package: jamulus-headless -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - adduser, -Description: Low latency Audio Server (headless) - The Jamulus software enables musicians to perform real-time jam sessions over - the internet. There is one server running the Jamulus server software which - collects the audio data from each Jamulus client, mixes the audio data and - sends the mix back to each client. - . - It runs on Windows / OSX / Linux. - . - This package contains a Jamulus binary built for headless operation - (without GUI library dependencies) and a jamulus-headless systemd service. diff --git a/distributions/debian/rules b/distributions/debian/rules deleted file mode 100755 index 16a8428706..0000000000 --- a/distributions/debian/rules +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/make -f - -export QT_SELECT=qt5 - -%: - dh $@ - -override_dh_auto_configure: - mkdir -p build-gui && cd build-gui && qmake TARGET=jamulus PREFIX=/usr ../Jamulus.pro - mkdir -p build-nox && cd build-nox && qmake "CONFIG+=nosound headless" TARGET=jamulus-headless PREFIX=/usr ../Jamulus.pro - -override_dh_auto_build: - cd src/res/translation && lrelease *.ts - cd build-gui && make - cd build-nox && make - -override_dh_auto_install: - cd build-nox && make install INSTALL_ROOT=../debian/tmp - cd build-gui && make install INSTALL_ROOT=../debian/tmp - -override_dh_auto_clean: - rm -rf build-gui - rm -rf build-nox - dh_clean