Merge branch 'master' of https://github.com/corrados/jamulus

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 <debian@marclandolt.ch>  Sun, 26 May 2019 13:11:40 +0200

distributions/debian/control

@@ -2,14 +2,32 @@ Source: jamulus
 Section: sound
 Priority: optional
 Maintainer: "Marc Landolt jr" <debian@marclandolt.ch>
-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/
+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: ${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
+ 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.

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 <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/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/
-	

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

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;
-