diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2023-03-06 11:38:06 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2023-03-06 12:19:23 +0100 |
commit | e99c5cbfd1754b5705c57db22e32b8d8ec03b5b3 (patch) | |
tree | d66b606584ce1a717497e54b68d2d383dac25802 | |
parent | 6025ac4c89219739a1ab5eb1e027cf8ff0cf570e (diff) |
We do not believe rsh was supposed to exclude GPL-3
-rw-r--r-- | COPYING | 15 | ||||
-rw-r--r-- | methods/rsh.cc | 14 |
2 files changed, 28 insertions, 1 deletions
@@ -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 <bcollins@debian.org> 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, <adymo@kdevelop.org> 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 <bcollins@debian.org>, 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 /*{{{*/ |