From 3409d657a74853b0df95804f1ce595c0fb84a88f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Mar 2023 10:43:57 +0100 Subject: Update lintian override info format in d/apt.lintian-overrides lintian-brush only fixed the spare-manual-page ones. Fixes: lintian: mismatched-override See-also: https://lintian.debian.org/tags/mismatched-override.html --- debian/apt.lintian-overrides | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/apt.lintian-overrides b/debian/apt.lintian-overrides index 78a47a1b3..1e36ba5d8 100644 --- a/debian/apt.lintian-overrides +++ b/debian/apt.lintian-overrides @@ -1,11 +1,10 @@ # the private library is for internal sharing only apt: package-name-doesnt-match-sonames -apt: exit-in-shared-library usr/lib*/libapt-private.so.0.0.0 -apt: no-symbols-control-file usr/lib*/libapt-private.so.0.0.0 +apt: exit-in-shared-library [usr/lib*/libapt-private.so.0.0.0] # we are implementing our own fallback and it is a minor usecase only -apt: missing-depends-on-sensible-utils sensible-pager usr/lib*/libapt-private.so.0.0.0 +apt: missing-depends-on-sensible-utils sensible-pager [usr/lib*/libapt-private.so.0.0.0] # these man pages document usage/config for things called via apt -apt: spare-manual-page usr/share/man*/man1/apt-transport-http.1.gz -apt: spare-manual-page usr/share/man*/man1/apt-transport-https.1.gz -apt: spare-manual-page usr/share/man*/man1/apt-transport-mirror.1.gz -apt: spare-manual-page usr/share/man*/man8/apt-secure.8.gz +apt: spare-manual-page [usr/share/man*/man1/apt-transport-http.1.gz] +apt: spare-manual-page [usr/share/man*/man1/apt-transport-https.1.gz] +apt: spare-manual-page [usr/share/man*/man1/apt-transport-mirror.1.gz] +apt: spare-manual-page [usr/share/man*/man8/apt-secure.8.gz] -- cgit v1.2.3-18-g5258 From 5039c586a833b67f00fe5e480bf2f3e074cf7fc5 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Tue, 6 Sep 2022 20:14:12 +0200 Subject: machine-readable version of COPYING The debian/copyright (COPYING) file is missing at least two licenses (Expat, BSD-3-clause) and some copyright statements. A machine-readable version of COPYING is attached that fixes these. Closes: #1019273 --- COPYING | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 169 insertions(+), 17 deletions(-) diff --git a/COPYING b/COPYING index 2f9ab10e8..d518ef5d4 100644 --- a/COPYING +++ b/COPYING @@ -1,22 +1,174 @@ -Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. -Apt is currently developed by APT Development Team . +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: apt +Upstream-Contact: APT Development Team +Source: https://salsa.debian.org/apt-team/apt -License: GPLv2+ +Files: * +Copyright: 1997-1999 Jason Gunthorpe and others +License: GPL-2+ - This program 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. +Files: apt-pkg/cachefilter-patterns.* + apt-private/private-json-hooks.* + test/libapt/pattern_test.cc +Copyright: 2018, 2019 Canonical Ltd +License: GPL-2+ - This program 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. +Files: po/lt.po +Copyright: 2006 Canonical Ltd, and Rosetta Contributors 2006 +License: GPL-2+ - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +Files: apt-pkg/contrib/weakptr.h + apt-pkg/contrib/string_view.h + CMakeLists.txt +Copyright: 2009, 2010, 2015, 2016 Julian Andres Klode +License: GPL-2+ -See /usr/share/common-licenses/GPL-2, or - for the terms of the latest version -of the GNU General Public License. +Files: debian/apt.postrm +Copyright: 1998, Ben Gertzfield +License: GPL-2+ + +Files: doc/po/pt.po + po/bg.po + po/it.po + po/sv.po + po/th.po +Copyright: 2002-2019 Free Software Foundation, Inc. +License: GPL-2+ + +Files: doc/po/es.po + po/tl.po +Copyright: 2003, 2004, 2005, 2009, 2010, 2012 Software in the Public Interest +License: GPL-2+ + +Files: po/nb.po +Copyright: 2002-2003 Lars Bahner + 2003-2004 Axel Bojer + 2004 Klaus Ade Johnstad + 2004 Bjorn Steensrud + 2003, 2005-2010 Hans Fredrik Nordhaug + 2016, 2018 Petter Reinholdtsen +License: GPL-2 + +Files: po/tr.po +Copyright: 2009 Rosetta Contributors and Canonical Ltd 2009 + 2013 Debian L10n Turkish 2013 + 2013-2018 Mert Dirik +License: GPL-2+ + +Files: doc/po/pl.po +Copyright: 2004 Krzysztof Fiertek + 2000-2004, 2010, 2012 Robert Luberda +License: GPL-2+ + +Files: doc/po/it.po +Copyright: 2000-2017 Debian Italian l10n team +License: GPL-2+ + +Files: doc/po/ja.po +Copyright: 2003-2017 Debian Japanese List +License: GPL-2+ + +Files: doc/po/fr.po +Copyright: 2000-2018 Debian French l10n team +License: GPL-2+ + +Files: doc/design.dbk +Copyright: 1997 Manoj Srivastava +License: GPL-2+ + +Files: doc/dpkg-tech.dbk +Copyright: 1997 Tom Lees +License: GPL-2+ + +Files: methods/rred.cc +Copyright: 2014 Anthony Towns +License: GPL-2+ + +Files: methods/rsh.cc +Copyright: 2000 Ben Collins +License: GPL-2 + +Files: CMake/FindBerkeley.cmake +Copyright: 2006, Alexander Dymo, + 2016, Julian Andres Klode +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: CMake/Documentation.cmake + CMake/FindLFS.cmake +Copyright: 2016 Julian Andres Klode +License: Expat + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms version 2 of the GNU General Public License + as published by the Free Software Foundation. + . + 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. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: GPL-2+ + This program 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 program 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. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +Comment: + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". -- cgit v1.2.3-18-g5258 From d9039b2409e69e651bf0d7ba582dbf528086332d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 27 Feb 2023 17:58:33 +0100 Subject: Address statements of public domain --- COPYING | 13 +++++++++++++ apt-pkg/contrib/cmndline.cc | 4 ++++ apt-pkg/contrib/configuration.cc | 6 +++++- apt-pkg/contrib/error.cc | 4 ++++ apt-pkg/contrib/error.h | 4 ++++ apt-pkg/contrib/fileutl.cc | 8 ++++++++ apt-pkg/contrib/fileutl.h | 4 ++++ apt-pkg/contrib/macros.h | 4 ++++ apt-pkg/contrib/mmap.h | 6 +++++- apt-pkg/contrib/netrc.cc | 4 ++++ apt-pkg/contrib/netrc.h | 4 ++++ apt-pkg/contrib/strutl.cc | 4 ++++ apt-pkg/contrib/strutl.h | 4 ++++ po/ar.po | 5 +++++ po/bs.po | 5 +++++ po/cs.po | 5 +++++ po/dz.po | 5 +++++ po/el.po | 5 +++++ po/eu.po | 4 ++++ po/fi.po | 5 +++++ po/gl.po | 5 +++++ po/he.po | 5 +++++ po/km.po | 4 ++++ po/mr.po | 4 ++++ po/ro.po | 5 +++++ po/uk.po | 5 +++++ po/vi.po | 5 +++++ po/zh_CN.po | 5 +++++ 28 files changed, 139 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index d518ef5d4..825da5132 100644 --- a/COPYING +++ b/COPYING @@ -2,6 +2,19 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: apt Upstream-Contact: APT Development Team Source: https://salsa.debian.org/apt-team/apt +Comment: + APT is an old software with lots of contributors over its lifetime. This + file is a best effort to document the statements of copyright and licenses + as stated in the file, but is not a complete representation of all copyright + holders - those have been lost to times. + . + Several bits of apt-pkg/contrib have had public domain dedications but + contributions from authors in countries not recognizing a public domain + concept. We believe that these contributions have been done in good faith, + and we treat them as if they had been made under the GPL-2+ as we believe + some contributors may have missed these facts and the overall license statement + for the project has always been GPL-2+, so we cannot be sure that contributors + meant to grant additional permissions. Files: * Copyright: 1997-1999 Jason Gunthorpe and others diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index b80543c91..998af2fd6 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -1,9 +1,13 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### Command Line Class - Sophisticated command line parser + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 5a7db1bbf..1134ed667 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -8,9 +9,12 @@ for a tree-oriented configuration environment. All runtime configuration is stored in here. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . - + ##################################################################### */ /*}}}*/ // Include files /*{{{*/ diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index ac53b9648..dd28af16d 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -7,6 +8,9 @@ We use a simple STL vector to store each error record. A PendingFlag is kept which indicates when the vector contains a Sever error. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 24eead8d5..dd50b9cc4 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -31,6 +32,9 @@ if (open(..)) return _error->Errno(..); + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 10c656301..fad51ded1 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -7,6 +8,9 @@ CopyFile - Buffered copy of a single file GetLock - dpkg compatible lock file manipulation (fcntl) + This file had this historic note, but now includes further changes + under the GPL-2.0+: + Most of this source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . @@ -14,6 +18,10 @@ The exception is RunScripts() it is under the GPLv2 + We believe that this reference to GPLv2 was not meant to exclude later + versions as that would have changed the overall project license from GPL-2+ + to GPL-2. + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 6f808ac9b..970b11878 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -12,6 +13,9 @@ The file class is a handy abstraction for various functions+classes that need to accept filenames. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index f37eb585b..c08cd24d9 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -1,9 +1,13 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### Macros Header - Various useful macro definitions + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Brian C. White. diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 76db7b542..fe834d5ba 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -16,9 +17,12 @@ generators. It provides a large allocated workspace and members to allocate space from the workspace in an efficient fashion. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. - + ##################################################################### */ /*}}}*/ #ifndef PKGLIB_MMAP_H diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index a6f408c0e..ec694da75 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -1,10 +1,14 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### netrc file parser - returns the login and password of a give host in a specified netrc-type file + This file had this historic note, but now includes further changes + under the GPL-2.0+: + Originally written by Daniel Stenberg, , et al. and placed into the Public Domain, do with it what you will. diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 444397900..2d202d14b 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -1,10 +1,14 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### netrc file parser - returns the login and password of a give host in a specified netrc-type file + This file had this historic note, but now includes further changes + under the GPL-2.0+: + Originally written by Daniel Stenberg, , et al. and placed into the Public Domain, do with it what you will. diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 3a0a6eaa3..67100f1a2 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -8,6 +9,9 @@ things to strings. They are useful in file parsers, URI handlers and especially in APT methods. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 8439af6fe..1fdc8dc99 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -1,4 +1,5 @@ // -*- mode: cpp; mode: fold -*- +// SPDX-License-Identifier: GPL-2.0+ // Description /*{{{*/ /* ###################################################################### @@ -7,6 +8,9 @@ _strstrip is a function to remove whitespace from the front and end of a string. + This file had this historic note, but now includes further changes + under the GPL-2.0+: + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe diff --git a/po/ar.po b/po/ar.po index 76ad55a26..0d301a3fc 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,4 +1,9 @@ # translation of apt_po.po to Arabic +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Ossama M. Khayat , 2005, 2006. diff --git a/po/bs.po b/po/bs.po index 76f26f4de..a33a8553d 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,4 +1,9 @@ # APT - Advanced Package Transfer +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Safir Šećerović , 2004 # diff --git a/po/cs.po b/po/cs.po index de05a2f11..fb6d1cb70 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,4 +1,9 @@ # Czech translation of APT +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Miroslav Kure , 2004-2023. # diff --git a/po/dz.po b/po/dz.po index c119df8b8..5167c48b4 100644 --- a/po/dz.po +++ b/po/dz.po @@ -1,3 +1,8 @@ +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Kinley Tshering , 2006 msgid "" diff --git a/po/el.po b/po/el.po index d649f66de..94e2971ec 100644 --- a/po/el.po +++ b/po/el.po @@ -1,6 +1,11 @@ # translation of apt_po_el.po to Greek # translation of apt_po_el.po to # Greek Translation of APT. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Fanis Dokianakis , 2003. diff --git a/po/eu.po b/po/eu.po index c0c407ee0..ed88f37b8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,4 +1,8 @@ # translation of apt_po_eu.po to Euskara +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Hizkuntza Politikarako Sailburuordetza , 2005. diff --git a/po/fi.po b/po/fi.po index 230594bb1..77e8c45fa 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,5 +1,10 @@ # translation of fi.po to Finnish # Finnish translation of apt. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Tapio Lehtonen , 2004-2006,2008. # diff --git a/po/gl.po b/po/gl.po index 6b1753446..69a442244 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,5 +1,10 @@ # translation of apt_po_gl.po to galician # Galician translation of apt +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Jacobo Tarrío , 2005, 2007, 2008. diff --git a/po/he.po b/po/he.po index 2f7b7f4f0..50581bc36 100644 --- a/po/he.po +++ b/po/he.po @@ -1,4 +1,9 @@ # English translation of apt_po. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Lior Kaplan , 2004. # diff --git a/po/km.po b/po/km.po index 69ead3610..6f7e34e6e 100644 --- a/po/km.po +++ b/po/km.po @@ -1,5 +1,9 @@ # translation of apt_po_km.po to Khmer # translation of apt_po_km.po to +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Eng Vannak , 2006. diff --git a/po/mr.po b/po/mr.po index c30530fb6..0dd6b9ccf 100644 --- a/po/mr.po +++ b/po/mr.po @@ -1,5 +1,9 @@ # Marathi messages for the apt suite. # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Sampada , 2008 # diff --git a/po/ro.po b/po/ro.po index bc50cb668..b5667b6e3 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,4 +1,9 @@ # translation of ro.po to Romanian +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # Sorin Batariuc , 2004, 2005, 2006. diff --git a/po/uk.po b/po/uk.po index da8baf324..94a1e4f4d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,4 +1,9 @@ # translation of apt-all.po to Українська +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # # A. Bondarenko , 2006, 2012. diff --git a/po/vi.po b/po/vi.po index 15350ab34..37c8af21a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,5 +1,10 @@ # Vietnamese Translation for Apt. # Bản dịch tiếng Việt dành cho Apt. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Clytie Siddall , 2005, 2006, 2007, 2008, 2009, 2010. # Trần Ngọc Quân , 2012-2014. diff --git a/po/zh_CN.po b/po/zh_CN.po index 15c37a18a..25da950c5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,4 +1,9 @@ # Chinese/Simplified translation of apt. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# +# This file originally stated: # This file is put in the public domain. # Deng Xiyue , 2007, 2008. # Tchaikov , 2005, 2007. -- cgit v1.2.3-18-g5258 From c87be2c388227ff212bba1058f35df9df6794f23 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Mar 2023 10:26:46 +0100 Subject: po/nb.po: Relicensing GPL-2.0 -> GPL-2.0+ Thanks Petter for chasing down the copyright holders and getting consent. --- COPYING | 2 +- po/nb.po | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index 825da5132..04fc7d444 100644 --- a/COPYING +++ b/COPYING @@ -60,7 +60,7 @@ Copyright: 2002-2003 Lars Bahner 2004 Bjorn Steensrud 2003, 2005-2010 Hans Fredrik Nordhaug 2016, 2018 Petter Reinholdtsen -License: GPL-2 +License: GPL-2+ Files: po/tr.po Copyright: 2009 Rosetta Contributors and Canonical Ltd 2009 diff --git a/po/nb.po b/po/nb.po index f937daec5..ff7e57626 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,5 +1,7 @@ # Norsk Bokmal translation of messages in APT. -# The file is available under Gnu Public License version 2. +# SPDX-License-Identifier: GPL-2.0+ +# The file is available under Gnu Public License version 2, +# or (at your option) any later version. # Get the license from http://www.gnu.org/licenses/gpl.txt # Copyright: # Lars Bahner , 2002-2003. -- cgit v1.2.3-18-g5258 From 6a3e2bfba4491057795169314c36903b0cbb43f8 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Mar 2023 10:34:44 +0100 Subject: COPYING: Group by license The concrete copyright holders listed are not really relevant for anything, as they are woefully incomplete anyhow. Grouping by licensing allows us to focus on what matters: Parts that have a different license from the overall project. --- COPYING | 83 +++++++++++------------------------------------------------------ 1 file changed, 14 insertions(+), 69 deletions(-) diff --git a/COPYING b/COPYING index 04fc7d444..79983adda 100644 --- a/COPYING +++ b/COPYING @@ -18,83 +18,28 @@ Comment: Files: * Copyright: 1997-1999 Jason Gunthorpe and others -License: GPL-2+ - -Files: apt-pkg/cachefilter-patterns.* - apt-private/private-json-hooks.* - test/libapt/pattern_test.cc -Copyright: 2018, 2019 Canonical Ltd -License: GPL-2+ - -Files: po/lt.po -Copyright: 2006 Canonical Ltd, and Rosetta Contributors 2006 -License: GPL-2+ - -Files: apt-pkg/contrib/weakptr.h - apt-pkg/contrib/string_view.h - CMakeLists.txt -Copyright: 2009, 2010, 2015, 2016 Julian Andres Klode -License: GPL-2+ - -Files: debian/apt.postrm -Copyright: 1998, Ben Gertzfield -License: GPL-2+ - -Files: doc/po/pt.po - po/bg.po - po/it.po - po/sv.po - po/th.po -Copyright: 2002-2019 Free Software Foundation, Inc. -License: GPL-2+ - -Files: doc/po/es.po - po/tl.po -Copyright: 2003, 2004, 2005, 2009, 2010, 2012 Software in the Public Interest -License: GPL-2+ - -Files: po/nb.po -Copyright: 2002-2003 Lars Bahner + 2018, 2019 Canonical Ltd + 2009, 2010, 2015, 2016 Julian Andres Klode + 1998, Ben Gertzfield + 2002-2019 Free Software Foundation, Inc. + 2003, 2004, 2005, 2009, 2010, 2012 Software in the Public Interest + 2002-2003 Lars Bahner 2003-2004 Axel Bojer 2004 Klaus Ade Johnstad 2004 Bjorn Steensrud 2003, 2005-2010 Hans Fredrik Nordhaug 2016, 2018 Petter Reinholdtsen -License: GPL-2+ - -Files: po/tr.po -Copyright: 2009 Rosetta Contributors and Canonical Ltd 2009 + 2009 Rosetta Contributors and Canonical Ltd 2009 2013 Debian L10n Turkish 2013 2013-2018 Mert Dirik -License: GPL-2+ - -Files: doc/po/pl.po -Copyright: 2004 Krzysztof Fiertek + 2004 Krzysztof Fiertek 2000-2004, 2010, 2012 Robert Luberda -License: GPL-2+ - -Files: doc/po/it.po -Copyright: 2000-2017 Debian Italian l10n team -License: GPL-2+ - -Files: doc/po/ja.po -Copyright: 2003-2017 Debian Japanese List -License: GPL-2+ - -Files: doc/po/fr.po -Copyright: 2000-2018 Debian French l10n team -License: GPL-2+ - -Files: doc/design.dbk -Copyright: 1997 Manoj Srivastava -License: GPL-2+ - -Files: doc/dpkg-tech.dbk -Copyright: 1997 Tom Lees -License: GPL-2+ - -Files: methods/rred.cc -Copyright: 2014 Anthony Towns + 2000-2017 Debian Italian l10n team + 2003-2017 Debian Japanese List + 2000-2018 Debian French l10n team + 1997 Manoj Srivastava + 1997 Tom Lees + 2014 Anthony Towns License: GPL-2+ Files: methods/rsh.cc -- cgit v1.2.3-18-g5258 From 554583df045b43767e0a9e3ef889410ede076af2 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Mar 2023 11:07:35 +0100 Subject: Address translation licensing concerns --- COPYING | 6 ++++++ po/apt-all.pot | 4 +++- po/ast.po | 4 ++++ po/bg.po | 4 ++++ po/ca.po | 4 ++++ po/cy.po | 4 ++++ po/da.po | 4 ++++ po/de.po | 4 ++++ po/es.po | 3 +++ po/fr.po | 3 +++ po/hu.po | 3 +++ po/it.po | 4 ++++ po/ja.po | 4 ++++ po/ko.po | 3 +++ po/ku.po | 3 +++ po/lt.po | 3 +++ po/nb.po | 3 +++ po/ne.po | 3 +++ po/nl.po | 3 +++ po/nn.po | 4 ++++ po/pl.po | 3 +++ po/pt.po | 3 +++ po/pt_BR.po | 3 +++ po/ru.po | 3 +++ po/sk.po | 3 +++ po/sl.po | 3 +++ po/sv.po | 3 +++ po/th.po | 3 +++ po/tl.po | 3 +++ po/tr.po | 3 +++ po/zh_TW.po | 3 +++ 31 files changed, 105 insertions(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 79983adda..359d045c4 100644 --- a/COPYING +++ b/COPYING @@ -15,6 +15,12 @@ Comment: some contributors may have missed these facts and the overall license statement for the project has always been GPL-2+, so we cannot be sure that contributors 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. + 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). Files: * Copyright: 1997-1999 Jason Gunthorpe and others diff --git a/po/apt-all.pot b/po/apt-all.pot index 7e8dc514d..d1126c218 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1,5 +1,7 @@ # SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # FIRST AUTHOR , YEAR. # #, fuzzy diff --git a/po/ast.po b/po/ast.po index b989efd0c..717bcffa7 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1,3 +1,7 @@ +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # iñigo varela , 2010. # maacub , 2010. msgid "" diff --git a/po/bg.po b/po/bg.po index 734e244ce..20b30bed6 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,6 +1,10 @@ # translation of apt-all.pot to Bulgarian # Bulgarian translation of apt. # Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # # Yavor Doganov , 2006. diff --git a/po/ca.po b/po/ca.po index 280086890..15d4e4abc 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,4 +1,8 @@ # Catalan translation of APT. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012 Software in the Public Interest, Inc. # Antoni Bella Perez , 2002, 2003. # Matt Bonner , 2003. diff --git a/po/cy.po b/po/cy.po index c3fdd6ba9..2858bd3e8 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1,4 +1,8 @@ # APT yn Gymraeg: APT in Welsh. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is under the same licence as APT itself. # Dafydd Harries , 2004. # diff --git a/po/da.po b/po/da.po index 383fc0870..b407e7166 100644 --- a/po/da.po +++ b/po/da.po @@ -1,5 +1,9 @@ # Danish translation apt. # Copyright (C) 2014 apt & nedenstående oversættere. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Claus Hindsgaul , 2002, 2003, 2004, 2005, 2006, 2007. # Joe Hansen , 2010, 2012, 2013, 2014, 2017. diff --git a/po/de.po b/po/de.po index 012c18683..96ef360ac 100644 --- a/po/de.po +++ b/po/de.po @@ -1,5 +1,9 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Helge Kreutzmann , 2020-2023. # Holger Wansing , 2008, 2009, 2010, 2012, 2014, 2017, 2018. # Jens Seidel , 2008. diff --git a/po/es.po b/po/es.po index fed81c505..a4f1a3c6c 100644 --- a/po/es.po +++ b/po/es.po @@ -1,6 +1,9 @@ # Advanced Package Transfer - APT message translation catalog # Copyright (C) 2002-2010 Free Software Foundation, Inc. # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # # Current translator: # - Manuel "Venturi" Porras Peralta , 2014-2016 diff --git a/po/fr.po b/po/fr.po index c93a75be6..a53f641ad 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,6 +2,9 @@ # Advanced Package Transfer - APT message translation catalog # French messages # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Pierre Machard , 2002,2003,2004. # Christian Perrier , 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. # Julien Patriarca , 2013, 2017, 2018. diff --git a/po/hu.po b/po/hu.po index 2cb0795fb..b547ee5be 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,6 +1,9 @@ # Advanced Package Transfer - APT message translation catalog # Hungarian messages # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # PASZTOR Gyorgy , 2002. # Gabor Kelemen , 2004, 2005, 2011, 2012, 2016. msgid "" diff --git a/po/it.po b/po/it.po index df904c1cc..5ebe85b12 100644 --- a/po/it.po +++ b/po/it.po @@ -1,5 +1,9 @@ # Italian translation of apt # Copyright (C) 2002-2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019 The Free Software Foundation, Inc. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon , 2002. # Milo Casagrande , 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019. diff --git a/po/ja.po b/po/ja.po index 8eab1ad9b..19e781123 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,5 +1,9 @@ # Japanese messages for apt. # Copyright (C) 2001 Free Software Foundation, Inc. +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Project Vine, Daisuke SUZUKI , 2001-2002 # Debian Project, Masato Taruishi , 2002 # Debian Project, Keita Maehara , 2003 diff --git a/po/ko.po b/po/ko.po index 00dc82486..0c8fd0023 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,3 +1,6 @@ +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Sunjae Park , 2006-2007, 2008. # Changwoo Ryu , 2004-2005, 2008, 2010. # diff --git a/po/ku.po b/po/ku.po index d2dcf4b25..c012a5d73 100644 --- a/po/ku.po +++ b/po/ku.po @@ -1,4 +1,7 @@ # Kurdish translation for apt +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # # Erdal Ronahi , 2008. diff --git a/po/lt.po b/po/lt.po index 6b64ab333..75ba936d5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,5 +1,8 @@ # Lithuanian translation for apt # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Gintautas Miliauskas , 2008. # Andrius Kokiančiks , 2008. diff --git a/po/nb.po b/po/nb.po index ff7e57626..323e0e294 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,5 +1,8 @@ # Norsk Bokmal translation of messages in APT. # SPDX-License-Identifier: GPL-2.0+ +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # The file is available under Gnu Public License version 2, # or (at your option) any later version. # Get the license from http://www.gnu.org/licenses/gpl.txt diff --git a/po/ne.po b/po/ne.po index 1e75c17d6..7d906c0c9 100644 --- a/po/ne.po +++ b/po/ne.po @@ -1,4 +1,7 @@ # translation of apt_po.po to Nepali +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Mahesh Subedi , 2006. # Shyam Krishna Bal , 2006. # Shiva Pokharel , 2006. diff --git a/po/nl.po b/po/nl.po index 96af78f67..fc585c9d6 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,7 @@ # Dutch po-file for apt +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # # Guus Sliepen , 2002. diff --git a/po/nn.po b/po/nn.po index a9df2c38d..d35c28dbc 100644 --- a/po/nn.po +++ b/po/nn.po @@ -2,6 +2,10 @@ # translation of apt.po to Norwegian nynorsk # translation of nn.po to Norwegian Nynorsk # translation of apt.po to Norwegian Nynorsk +# +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Gaute Hvoslef Kvalnes , 2003. # Havard Korsvoll , 2004, 2005. # diff --git a/po/pl.po b/po/pl.po index a07112990..9e4b40664 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,4 +1,7 @@ # Advanced Package Transfer - APT message translation catalog +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Polish translation by: # # Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych: diff --git a/po/pt.po b/po/pt.po index 282f6bd9d..5ef10fdef 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,4 +1,7 @@ # Debian-PT translation for apt. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Copyright (C) 2004 Free Software Foundation, Inc. # # diff --git a/po/pt_BR.po b/po/pt_BR.po index b8918676b..336b1e056 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,4 +1,7 @@ # Brazilian Portuguese translation for apt. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Copyright (C) 2002 Free Software Foundation, Inc. # Gustavo Noronha Silva , 2002. # Andre Luis Lopes , 2002-2005. diff --git a/po/ru.po b/po/ru.po index fec88e13d..1a9984c7c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,4 +1,7 @@ # Russian messages for the apt suite. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # # Vadim Kutchin , 2002. # Ilgiz Kalmetev , 2002. diff --git a/po/sk.po b/po/sk.po index 24b237f7e..cf9a07581 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,6 +3,9 @@ # initial sk.po made from Czech translation (cs.po) # thanks to Miroslav Kure # +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Peter Mann , 2006. # Ivan Masár , 2008, 2009, 2010, 2011, 2012. # diff --git a/po/sl.po b/po/sl.po index 9e7820936..6d59c5021 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,4 +1,7 @@ # translation of apt.po to Slovenian +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Matjaz Horvat , 2004. msgid "" msgstr "" diff --git a/po/sv.po b/po/sv.po index 67cc9f1cc..4446fd295 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,6 +1,9 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages # Copyright © 2002-2015 Free Software Foundation, Inc. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Peter Karlsson , 2002-2008. # Daniel Nylander , 2005-2010. diff --git a/po/th.po b/po/th.po index ad5a92ca0..fcfddea8e 100644 --- a/po/th.po +++ b/po/th.po @@ -1,5 +1,8 @@ # Thai translation of apt. # Copyright (C) 2007-2014 Free Software Foundation, Inc. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Theppiak Karoonboonyanan , 2007-2008, 2012, 2014. # Arthit Suriyawongkul , 2008. diff --git a/po/tl.po b/po/tl.po index b94ddb9b3..88e3217f6 100644 --- a/po/tl.po +++ b/po/tl.po @@ -1,5 +1,8 @@ # Tagalog messages for apt debconf. # Copyright (C) 2005 Software in the Public Interest, Inc. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as apt. # Itong talaksan ay ipinapamahagi sa parehong lisensya ng apt. # Eric Pareja , 2005 diff --git a/po/tr.po b/po/tr.po index c0484f52b..cc1ddd41c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,6 +2,9 @@ # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # Copyright (c) 2013 Debian L10n Turkish 2013 # Mert Dirik , 2013-2018. +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # This file is distributed under the same license as the apt package. # Rosetta Contributors, 2009. msgid "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 28e35b501..436003389 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,4 +1,7 @@ # 先進包裝工具 (apt) 繁體中文訊息 +# Licensing is complex as the msgid come from several files, please see +# the individual files for licensing information. +# # Translators: 黃思文 # Asho Yeh # Kanru Chen -- cgit v1.2.3-18-g5258 From 6025ac4c89219739a1ab5eb1e027cf8ff0cf570e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Mar 2023 11:09:39 +0100 Subject: COPYING: Address RunScripts() --- COPYING | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/COPYING b/COPYING index 359d045c4..f6607f84d 100644 --- a/COPYING +++ b/COPYING @@ -21,6 +21,10 @@ Comment: 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). + . + The apt-pkg/contrib/fileutl.cc file states "RunScripts()" is "GPLv2". + We believe that this was not meant to exclude later versions of the GPL, + as that would have changed the overall project license. Files: * Copyright: 1997-1999 Jason Gunthorpe and others -- cgit v1.2.3-18-g5258 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-18-g5258