Merge pull request #6 from ann0see/UnifDeb

Unify deb creation on linux

distributions/build-debian-package-auto.sh

@@ -5,27 +5,24 @@
 # 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
 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 <noemail@example.com> ${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..."
 

distributions/autobuilddeb/control → distributions/debian-gui/control

@@ -1,16 +1,16 @@
 Source: jamulus
 Section: sound
 Priority: optional
-Maintainer: "corrados" <nomail@example.com>
+Maintainer: "JamulusSoftware" <nomail@example.com>
 Build-Depends:
  debhelper (>= 9),
  libjack-jackd2-dev,
  qtbase5-dev,
  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.

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

distributions/debian/watch → 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

distributions/debian-headless/changelog

@@ -0,0 +1,5 @@
+jamulus (3.5.10~git-0) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+ -- marc <debian@marclandolt.ch>  Sun, 26 May 2019 13:11:40 +0200

distributions/debian-headless/compat

@@ -0,0 +1 @@
+9

distributions/debian-headless/control

@@ -0,0 +1,27 @@
+Source: jamulus
+Section: sound
+Priority: optional
+Maintainer: "JamulusSoftware" <nomail@example.com>
+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.

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 <debian.tormod@gmail.com>
+ 2020 Olivier Humbert <trebmuh@tuxfamily.org>
+ 2019 Marc Landolt jr <debian@marclandolt.ch>
+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 <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

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

distributions/debian-headless/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

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