From 6a991b56df30eed1bb5513b334bc73f265b9cb0b Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Mon, 31 Jan 2022 00:03:58 +0100 Subject: [PATCH 1/2] Build: debian/control: Use GPL-2+, not GPL-2 According to the headers in the code, Jamulus is "GPL v2 or later". The proper tag for this is GPL-2+. https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-syntax --- distributions/debian/copyright | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distributions/debian/copyright b/distributions/debian/copyright index e729aacab1..7647a352f1 100644 --- a/distributions/debian/copyright +++ b/distributions/debian/copyright @@ -5,16 +5,16 @@ Source: https://github.com/jamulussoftware/jamulus/ Files: * Copyright: 2004-2022 The Jamulus Development Team -License: GPL-2 +License: GPL-2+ Files: debian/* Copyright: 2020 Tormod Volden 2020 Olivier Humbert 2019 Marc Landolt jr -License: GPL-2 +License: GPL-2+ -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 From cf760d9de7530c4618ee1b4c85b4271519ff2d05 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Mon, 31 Jan 2022 00:10:04 +0100 Subject: [PATCH 2/2] Docs: debian/control: Properly show Volker's copyright Addresses https://github.com/jamulussoftware/jamulus/pull/2321#discussion_r795157739 --- distributions/debian/copyright | 4 +++- tools/update-copyright-notices.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/distributions/debian/copyright b/distributions/debian/copyright index 7647a352f1..2a87f0c7d9 100644 --- a/distributions/debian/copyright +++ b/distributions/debian/copyright @@ -4,7 +4,9 @@ Upstream-Contact: The Jamulus Development Team Source: https://github.com/jamulussoftware/jamulus/ Files: * -Copyright: 2004-2022 The Jamulus Development Team +Copyright: + 2021-2022 The Jamulus Development Team and contributors + 2004-2021 Volker Fischer and contributors License: GPL-2+ Files: debian/* diff --git a/tools/update-copyright-notices.sh b/tools/update-copyright-notices.sh index 281e6765ff..249a82c204 100755 --- a/tools/update-copyright-notices.sh +++ b/tools/update-copyright-notices.sh @@ -10,4 +10,4 @@ for file in $(find android ios linux mac src windows -regex '.*\.\(cpp\|h\|mm\)' sed -re 's/(\*.*Copyright.*[^-][0-9]{4})(\s*-\s*\b[0-9]{4})?\s*$/\1-'"${YEAR}"'/' -i "${file}" done -sed -re 's/(Copyright:\s*[0-9]{4}-)[0-9]{4}/\1'"${YEAR}"'/' -i distributions/debian/copyright +sed -re 's/^( [0-9]{4}-)[0-9]{4}( The Jamulus)/\1'"${YEAR}"'\2/' -i distributions/debian/copyright