From 8bd7a6fcf6049b700cff783f19d76ca33c6154cb Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:22:23 +0200 Subject: [PATCH 1/9] d/control: 1 item/line + alphabetically ordered (easier to read) --- distributions/debian/control | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/distributions/debian/control b/distributions/debian/control index db7c1211..20581b87 100644 --- a/distributions/debian/control +++ b/distributions/debian/control @@ -2,7 +2,15 @@ Source: jamulus Section: sound Priority: optional Maintainer: "Marc Landolt jr" -Build-Depends: debhelper (>= 9), libc6-dev | libc-dev ,g++, make, dpkg-dev, qtdeclarative5-dev, qt5-default, libjack-jackd2-dev +Build-Depends: + debhelper (>= 9), + dpkg-dev, + g++, + libc6-dev | libc-dev, + libjack-jackd2-dev, + make, + qt5-default, + qtdeclarative5-dev, Standards-Version: 3.9.5 Homepage: http://http://llcon.sourceforge.net/ Vcs-Git: git://github.com/corrados/jamulus.git @@ -10,6 +18,11 @@ Vcs-Browser: https://github.com/corrados/jamulus Package: jamulus Architecture: i386 amd64 armhf -Depends: ${shlibs:Depends}, ${misc:Depends}, qt5-default, qtchooser, jackd +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + jackd, + qt5-default, + qtchooser, Description: Low latency Audio Server/Client that runs on Windows / OSX / Linux From c12b978b309043760cc94530c7ba38214f5a7b49 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:24:28 +0200 Subject: [PATCH 2/9] d/control: fixes the homepage link --- distributions/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/debian/control b/distributions/debian/control index 20581b87..377e4167 100644 --- a/distributions/debian/control +++ b/distributions/debian/control @@ -12,7 +12,7 @@ Build-Depends: qt5-default, qtdeclarative5-dev, Standards-Version: 3.9.5 -Homepage: http://http://llcon.sourceforge.net/ +Homepage: http://llcon.sourceforge.net/ Vcs-Git: git://github.com/corrados/jamulus.git Vcs-Browser: https://github.com/corrados/jamulus From 86a21257736fd081a78f456bc94bbff94a0dfdd3 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:27:16 +0200 Subject: [PATCH 3/9] d/control: improve description --- distributions/debian/control | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/distributions/debian/control b/distributions/debian/control index 377e4167..1776c186 100644 --- a/distributions/debian/control +++ b/distributions/debian/control @@ -25,4 +25,9 @@ Depends: qt5-default, qtchooser, Description: Low latency Audio Server/Client - that runs on Windows / OSX / Linux + 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. From 6bd1aa43176ed22963eca52f75b68350c924baf1 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:35:32 +0200 Subject: [PATCH 4/9] d/copyright: rewrite to current standard --- distributions/debian/copyright | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/distributions/debian/copyright b/distributions/debian/copyright index 782656ab..a34612a0 100644 --- a/distributions/debian/copyright +++ b/distributions/debian/copyright @@ -1,3 +1,31 @@ -GNU General Public License version 2.0 (GPLv2) -Files: src/* +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Jamulus +Upstream-Contact: Volker Fischer +Source: https://github.com/corrados/jamulus/ + +Files: * +Copyright: 2004-2020 Volker Fischer License: GPL-2 + +Files: debian/* +Copyright: + 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". From 487d275e17d54aabbc73c2e3510356569c08991e Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:39:10 +0200 Subject: [PATCH 5/9] desktop file: adds French translation --- distributions/jamulus.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distributions/jamulus.desktop b/distributions/jamulus.desktop index 75351b7e..41fb5532 100644 --- a/distributions/jamulus.desktop +++ b/distributions/jamulus.desktop @@ -1,10 +1,11 @@ [Desktop Entry] Name=Jamulus Comment=Jam Session +Comment[fr]=Séance de bœuf GenericName=Internet Jam Session Software +GenericName[fr]=Logiciel de séance de bœuf sur Internet Exec=jamulus Icon=jamulus Terminal=false Type=Application Categories=AudioVideo;Audio;Mixer;Qt; - From 08445a3eb7b2c5ab9d722631f5bd48886c524cff Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:42:12 +0200 Subject: [PATCH 6/9] d/changelog: update to 3.4.7 version --- distributions/debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distributions/debian/changelog b/distributions/debian/changelog index c9a28966..0ad8cbb2 100644 --- a/distributions/debian/changelog +++ b/distributions/debian/changelog @@ -1,5 +1,5 @@ -jamulus (3.4.3) UNRELEASED; urgency=medium +jamulus (3.4.7) UNRELEASED; urgency=medium - * Initial release. (Closes: 3.4.3) + * Initial release. -- marc Sun, 26 May 2019 13:11:40 +0200 From 295a795a62458d16e7d6cd4c56f16ec4cb0fa33d Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:44:11 +0200 Subject: [PATCH 7/9] create d/watch (will help for a future possible inclusion in debian repo) --- distributions/debian/watch | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 distributions/debian/watch diff --git a/distributions/debian/watch b/distributions/debian/watch new file mode 100644 index 00000000..95b58e4b --- /dev/null +++ b/distributions/debian/watch @@ -0,0 +1,5 @@ +version=4 +# GitHub hosted projects +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ + https://github.com/corrados/jamulus/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate From 1f3f89917ed9b6aac778b9795ad659ad8c266c3d Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:48:03 +0200 Subject: [PATCH 8/9] d/control: removes a trailing whitespace --- distributions/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/debian/control b/distributions/debian/control index 1776c186..f344b6be 100644 --- a/distributions/debian/control +++ b/distributions/debian/control @@ -15,7 +15,7 @@ Standards-Version: 3.9.5 Homepage: http://llcon.sourceforge.net/ Vcs-Git: git://github.com/corrados/jamulus.git Vcs-Browser: https://github.com/corrados/jamulus - + Package: jamulus Architecture: i386 amd64 armhf Depends: From 48fc04fbe056d7638178862c66953d3da508f999 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 12 Apr 2020 00:49:28 +0200 Subject: [PATCH 9/9] d/rules: removes several trailing whitespaces --- distributions/debian/rules | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/distributions/debian/rules b/distributions/debian/rules index de8bfa82..81c3e917 100755 --- a/distributions/debian/rules +++ b/distributions/debian/rules @@ -1,5 +1,5 @@ -#!/usr/bin/make -f -%: +#!/usr/bin/make -f +%: dh $@ override_dh_auto_configure: @@ -15,4 +15,3 @@ override_dh_usrlocal: cp $$(pwd)/distributions/jamulus.png $$(pwd)/debian/jamulus/usr/share/icons/hicolor/48x48/apps/ mkdir -p $$(pwd)/debian/jamulus/lib/systemd/system cp $$(pwd)/distributions/jamulus-server.service $$(pwd)/debian/jamulus/lib/systemd/system/ -