From f01234e8a55689e3d72dda9f2776a87c6c58961a Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Wed, 13 Mar 2024 09:00:27 -0700 Subject: [PATCH] update debian/copyright - Correctly add ISC licenses to new files in ubuntutools/tests/* as specified in debian/copyright - Add GPL-3 licenses and correct attribution for: - running-autopkgtests - ubuntutools/running_autopkgtests.py --- debian/copyright | 5 ++++- running-autopkgtests | 15 ++++++++++++- ubuntutools/running_autopkgtests.py | 21 ++++++++++--------- ubuntutools/test/test_requestsync.py | 21 +++++++++---------- ubuntutools/test/test_running_autopkgtests.py | 21 +++++++++---------- 5 files changed, 49 insertions(+), 34 deletions(-) diff --git a/debian/copyright b/debian/copyright index 5551b55..1bec868 100644 --- a/debian/copyright +++ b/debian/copyright @@ -85,10 +85,12 @@ Files: doc/bitesize.1 merge-changelog pyproject.toml run-linters + running-autopkgtests setup-packaging-environment syncpackage + ubuntutools/running_autopkgtests.py Copyright: 2010, Benjamin Drung - 2007-2023, Canonical Ltd. + 2007-2024, Canonical Ltd. 2008, Jonathan Patrick Davies 2008-2010, Martin Pitt 2009, Siegfried-Angel Gevatter Pujals @@ -182,6 +184,7 @@ Copyright: 2009-2023, Benjamin Drung 2008, Siegfried-Angel Gevatter Pujals 2010-2011, Stefano Rivera 2017-2021, Dan Streetman + 2024, Canonical Ltd. License: ISC Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/running-autopkgtests b/running-autopkgtests index 8b7977d..14f52fe 100755 --- a/running-autopkgtests +++ b/running-autopkgtests @@ -4,7 +4,20 @@ # Authors: # Andy P. Whitcroft # Christian Ehrhardt - +# Chris Peterson +# +# Copyright (C) 2024 Canonical Ltd. +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranties of +# MERCHANTABILITY, SATISFACTORY QUALITY, 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 . """Dumps a list of currently running tests in Autopkgtest""" __example__ = """ diff --git a/ubuntutools/running_autopkgtests.py b/ubuntutools/running_autopkgtests.py index f583544..54efd67 100644 --- a/ubuntutools/running_autopkgtests.py +++ b/ubuntutools/running_autopkgtests.py @@ -1,18 +1,19 @@ # Copyright (C) 2024 Canonical Ltd. # Author: Chris Peterson +# Author: Andy P. Whitcroft +# Author: Christian Ehrhardt # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 3, as published +# by the Free Software Foundation. # -# 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 Affero General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranties of +# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. # -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . import datetime import json diff --git a/ubuntutools/test/test_requestsync.py b/ubuntutools/test/test_requestsync.py index 09fa3c4..a9cfc73 100644 --- a/ubuntutools/test/test_requestsync.py +++ b/ubuntutools/test/test_requestsync.py @@ -1,18 +1,17 @@ # Copyright (C) 2024 Canonical Ltd. # Author: Chris Peterson # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. import unittest diff --git a/ubuntutools/test/test_running_autopkgtests.py b/ubuntutools/test/test_running_autopkgtests.py index ec68acd..915ca68 100644 --- a/ubuntutools/test/test_running_autopkgtests.py +++ b/ubuntutools/test/test_running_autopkgtests.py @@ -1,18 +1,17 @@ # Copyright (C) 2024 Canonical Ltd. # Author: Chris Peterson # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. """ Tests for running_autopkgtests Tests using cached data from autopkgtest servers.