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

@@ -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 <bdrung@ubuntu.com>
-           2007-2023, Canonical Ltd.
+           2007-2024, Canonical Ltd.
            2008,      Jonathan Patrick Davies <jpds@ubuntu.com>
            2008-2010, Martin Pitt <martin.pitt@canonical.com>
            2009,      Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
@@ -182,6 +184,7 @@ Copyright: 2009-2023, Benjamin Drung <bdrung@ubuntu.com>
            2008,      Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
            2010-2011, Stefano Rivera <stefanor@ubuntu.com>
            2017-2021, Dan Streetman <ddstreet@canonical.com>
+           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

running-autopkgtests

@@ -4,7 +4,20 @@
 # Authors:
 #   Andy P. Whitcroft
 #   Christian Ehrhardt
-
+#   Chris Peterson <chris.peterson@canonical.com>
+#
+# 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 <http://www.gnu.org/licenses/>.
 """Dumps a list of currently running tests in Autopkgtest"""
 
 __example__ = """

ubuntutools/running_autopkgtests.py

@@ -1,18 +1,19 @@
 # Copyright (C) 2024 Canonical Ltd.
 # Author: Chris Peterson <chris.peterson@canonical.com>
+# Author: Andy P. Whitcroft
+# Author: Christian Ehrhardt
 #
-# This program is free software: you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify it
-# it under the terms of the GNU Affero General Public License as
+# under the terms of the GNU General Public License version 3, as published
-# published by the Free Software Foundation, either version 3 of the
+# by the Free Software Foundation.
-# License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, but
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
-# GNU Affero General Public License for more details.
+# See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Affero General Public License
+# You should have received a copy of the GNU General Public License along
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
 import json

ubuntutools/test/test_requestsync.py

@@ -1,18 +1,17 @@
 # Copyright (C) 2024 Canonical Ltd.
 # Author: Chris Peterson <chris.peterson@canonical.com>
 #
-# This program is free software: you can redistribute it and/or modify
+# Permission to use, copy, modify, and/or distribute this software for any
-# it under the terms of the GNU Affero General Public License as
+# purpose with or without fee is hereby granted, provided that the above
-# published by the Free Software Foundation, either version 3 of the
+# copyright notice and this permission notice appear in all copies.
-# License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# GNU Affero General Public License for more details.
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-#
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# You should have received a copy of the GNU Affero General Public License
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# PERFORMANCE OF THIS SOFTWARE.
 
 import unittest
 

ubuntutools/test/test_running_autopkgtests.py

@@ -1,18 +1,17 @@
 # Copyright (C) 2024 Canonical Ltd.
 # Author: Chris Peterson <chris.peterson@canonical.com>
 #
-# This program is free software: you can redistribute it and/or modify
+# Permission to use, copy, modify, and/or distribute this software for any
-# it under the terms of the GNU Affero General Public License as
+# purpose with or without fee is hereby granted, provided that the above
-# published by the Free Software Foundation, either version 3 of the
+# copyright notice and this permission notice appear in all copies.
-# License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# GNU Affero General Public License for more details.
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-#
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# You should have received a copy of the GNU Affero General Public License
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# PERFORMANCE OF THIS SOFTWARE.
 """ Tests for running_autopkgtests
 Tests using cached data from autopkgtest servers.