From 20dcab8300491de9668b45630c3d94ca89d4122f Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Thu, 18 Jul 2024 09:35:15 +0100 Subject: [PATCH] [global] Change license to GPL-2.0 across all files Related: #3705 Signed-off-by: Arif Ali --- debian/copyright | 24 +++++++++++++----------- snap/snapcraft.yaml | 2 +- sos.spec | 2 +- sos/report/plugins/microcloud.py | 2 +- sos/report/plugins/omnipath_client.py | 3 +-- sos/report/plugins/omnipath_manager.py | 3 +-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/copyright b/debian/copyright index 921c89370d..c691b88833 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,21 +3,23 @@ Upstream-Name: sosreport Upstream-Contact: Jake Hunsaker Source: https://github.com/sosreport/sos -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: * +Copyright: (C) 2012-2017 Bryn M. Reeves + (C) 2007-2024 Red Hat, Inc. + (C) 2012-2024 Canonical Ltd. +License: 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; version 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 + This application 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. - . - On Debian systems, the complete text of the GNU General Public - License, version 2, can be found in /usr/share/common-licenses/GPL-2. diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0f7f5f8865..b0e792a140 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -8,7 +8,7 @@ grade: stable base: core24 confinement: classic adopt-info: sos -license: GPL-2.0-or-later +license: GPL-2.0 environment: PYTHONPATH: ${SNAP}/lib/python3.12/site-packages:${SNAP}/usr/lib/python3/dist-packages:${PYTHONPATH} diff --git a/sos.spec b/sos.spec index fcb0d78d00..1ab470c448 100644 --- a/sos.spec +++ b/sos.spec @@ -3,7 +3,7 @@ Name: sos Version: 4.7.2 Release: 1%{?dist} Source0: https://github.com/sosreport/sos/archive/%{name}-%{version}.tar.gz -License: GPL-2.0-or-later +License: GPL-2.0 BuildArch: noarch Url: https://github.com/sosreport/sos BuildRequires: python3-devel diff --git a/sos/report/plugins/microcloud.py b/sos/report/plugins/microcloud.py index 9df3329996..2bd10b1747 100644 --- a/sos/report/plugins/microcloud.py +++ b/sos/report/plugins/microcloud.py @@ -4,7 +4,7 @@ # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions of -# version 2 or later of the GNU General Public License. +# version 2 of the GNU General Public License. # # See the LICENSE file in the source distribution for further information. diff --git a/sos/report/plugins/omnipath_client.py b/sos/report/plugins/omnipath_client.py index be04c70ef0..772a10fe29 100644 --- a/sos/report/plugins/omnipath_client.py +++ b/sos/report/plugins/omnipath_client.py @@ -2,8 +2,7 @@ # 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. +# the Free Software Foundation; either version 2 of the License. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/sos/report/plugins/omnipath_manager.py b/sos/report/plugins/omnipath_manager.py index 7d206d0391..8177c9d558 100644 --- a/sos/report/plugins/omnipath_manager.py +++ b/sos/report/plugins/omnipath_manager.py @@ -2,8 +2,7 @@ # 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. +# the Free Software Foundation; either version 2 of the License. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of