From e99c5cbfd1754b5705c57db22e32b8d8ec03b5b3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Mar 2023 11:38:06 +0100 Subject: We do not believe rsh was supposed to exclude GPL-3 --- COPYING | 15 ++++++++++++++- methods/rsh.cc | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/COPYING b/COPYING index f6607f84d..21b874fa7 100644 --- a/COPYING +++ b/COPYING @@ -17,7 +17,7 @@ Comment: meant to grant additional permissions. . Translation files are considered to generally be GPL-2+, - but they also include strings used by methods/rsh.cc which is GPL-2. + but they also include strings used by methods/rsh.cc which appears to be GPL-2. As the translations are split into separate domains later on, these strings are not loaded by library users outside of apt (they are in the 'apt' translation domain). @@ -55,6 +55,19 @@ License: GPL-2+ Files: methods/rsh.cc Copyright: 2000 Ben Collins License: GPL-2 +Comment: + This file stated: + Licensed under the GNU General Public License v2 [no exception clauses] + . + We believe that this was intended to be not a statement against future + versions of the GPL, but meant to exclude the Qt license exception in + place in APT until that time. + . + We received permission from Ben in 2021 to relicense under GPL-2+, + contributions from Adam Heath and Daniel Hartwig may still have to + be considered GPL-2 for the time being. + . + Other contributions are GPL-2+ Files: CMake/FindBerkeley.cmake Copyright: 2006, Alexander Dymo, diff --git a/methods/rsh.cc b/methods/rsh.cc index 68407b062..f5e12795a 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -5,8 +5,22 @@ RSH method - Transfer files via rsh compatible program Written by Ben Collins , Copyright (c) 2000 + + This file stated: Licensed under the GNU General Public License v2 [no exception clauses] + We believe that this was intended to be not a statement against future + versions of the GPL, but meant to exclude the Qt license exception in + place in APT until that time. + + We received permission from Ben in 2021 to relicense under GPL-2+, + contributions from Adam Heath and Daniel Hartwig may still have to + be considered GPL-2 for the time being. + + Other contributions are GPL-2+ + + See https://lists.debian.org/deity/2021/04/msg00013.html for details + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -- cgit v1.2.3-70-g09d2