old-python: Relax licence from AGPLv3+ + CAFv2+ to GPLv3+

Have received confirmation from Mark Wooding, the other contributor,
that this is OK.

Have not yet updated all copyright notices.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/old-python/COPYING b/old-python/COPYING
index 159c8c3e9710bdd735edb562829ee8d871983886..12aa7a5411ceeb808fa0ed0eb56f2fa546fcfe39 100644 (file)
--- a/old-python/COPYING
+++ b/old-python/COPYING
@@ -3,7 +3,7 @@ Hippotat - Asinine IP Over HTTP program
 Copyright 2017 Ian Jackson
 
 
-The client is:
+The client and server are both:
 
  GPLv3+
 
@@ -21,30 +21,5 @@ The client is:
     along with this program, in the file GPLv3.  If not,
     see <http://www.gnu.org/licenses/>.
 
-(This licence applies to all the short files without their own
-copyright notices, too.)
-
-
-The server is:
-
- AGPLv3+ + CAFv2+
-
-    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,
-    with the "CAF Login Exception" as published by Ian Jackson
-    (version 2, or at your option any later version) as an Additional
-    Permission.
-
-    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 and the CAF Login Exception along with this program, in
-    the file AGPLv3+CAFv2.  If not, email Ian Jackson
-    <ijackson@chiark.greenend.org.uk>.
 
 ----------------------------------------------------------------------