Change license for (some previous and) future revisions to GPL-3.0-or-later

From this revision on, all changes that were under the following
authors' names are also under GPL-3.0-or-later, and not just future
changes:
- Maxime Buquet (or Maxime “pep” Buquet)
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

README.rst

@@ -95,7 +95,7 @@ License
 Poezio is Free Software.
 (learn more: http://www.gnu.org/philosophy/free-sw.html)
 
-Poezio is released under the zlib License.
+Poezio is released under the GPL-3.0+ License.
 Please read the COPYING file for details.
 
 The artwork logo was made by Gaëtan Ribémont and released under

data/io.poez.Poezio.appdata.xml

@@ -4,7 +4,7 @@
   <id>io.poez.Poezio</id>
   <name>Poezio</name>
   <summary>Poezio is a free console XMPP client</summary>
-  <project_license>Zlib</project_license>
+  <project_license>GPL-3.0+</project_license>
   <metadata_license>CC0-1.0</metadata_license>
   <developer_name>Poezio Team</developer_name>
   <icon type="remote">https://poez.io/img/logo.svg</icon>

data/poezio_logs.1

@@ -70,5 +70,5 @@ Copyright \(co 2016 Tanguy Ortolo
 .PP
 This manual page was written for the Debian system (and may be used by others).
 .PP
-Permission is granted to copy, distribute and/or modify this document under the terms of the Zlib License.
+Permission is granted to copy, distribute and/or modify this document under the terms of the GPL-3.0+ License.
 .sp

data/scripts-manpages.xml

@@ -62,7 +62,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
   <para>This manual page was written for the Debian system
     (and may be used by others).</para>
   <para>Permission is granted to copy, distribute and/or modify this
-    document under the terms of the Zlib License.</para>
+    document under the terms of the GPL-3.0+ License.</para>
 </legalnotice>
 </info>
 

plugins/b64.py

@@ -4,7 +4,7 @@
 #
 # Copyright © 2019 Maxime “pep” Buquet <pep@bouah.net>
 #
-# Distributed under terms of the zlib license.
+# Distributed under terms of the GPL-3.0+ license.
 
 """
 Usage

plugins/lastlog.py

@@ -5,7 +5,7 @@
 # Copyright © 2018 Maxime “pep” Buquet
 # Copyright © 2019 Madhur Garg
 #
-# Distributed under terms of the zlib license. See the COPYING file.
+# Distributed under terms of the GPL-3.0+ license. See the COPYING file.
 
 """
     Search provided string in the buffer and return all results on the screen

poezio/common.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Various useful functions.
 """

poezio/connection.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Defines the Connection class
 """

poezio/contact.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Defines the Resource and Contact classes, which are used in
 the roster.

poezio/daemon.py

@@ -4,7 +4,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 This file is a standalone program that reads commands on
 stdin and executes them (each line should be a command).

poezio/events.py

@@ -2,7 +2,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Defines the EventHandler class.
 The list of available events is here:

poezio/keyboard.py

@@ -4,7 +4,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Functions to interact with the keyboard
 Mainly, read keys entered and return a string (most

poezio/logger.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 The logger module that handles logging of the poezio
 conversations and roster changes

poezio/multiuserchat.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Implementation of the XEP-0045: Multi-User Chat.
 Add some facilities that are not available on the XEP_0045

poezio/plugin_e2ee.py

@@ -4,7 +4,7 @@
 #
 # Copyright © 2019 Maxime “pep” Buquet <pep@bouah.net>
 #
-# Distributed under terms of the zlib license. See COPYING file.
+# Distributed under terms of the GPL-3.0+ license. See COPYING file.
 
 """
     Interface for E2EE (End-to-end Encryption) plugins.

poezio/poezio.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Starting point of poezio. Launches both the Connection and Gui
 """

poezio/poopt.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 '''This is a template module just for instruction. And poopt.'''
 
 from typing import List, Tuple

poezio/pooptmodule.c

@@ -3,7 +3,7 @@
 /* This file is part of Poezio. */
 
 /* Poezio is free software: you can redistribute it and/or modify */
-/* it under the terms of the zlib license. See the COPYING file. */
+/* it under the terms of the GPL-3.0+ license. See the COPYING file. */
 
 /** The poopt python3 module
 **/

poezio/roster.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Defines the Roster and RosterGroup classes
 """

poezio/theming.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Define the variables (colors and some other stuff) that are
 used when drawing the interface.

poezio/timed_events.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Timed events are the standard way to schedule events for later in poezio.
 

poezio/user.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Define the user class.
 A user is a MUC participant, not a roster contact (see contact.py)

poezio/xdg.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Implements the XDG base directory specification.
 

poezio/xhtml.py

@@ -3,7 +3,7 @@
 # This file is part of Poezio.
 #
 # Poezio is free software: you can redistribute it and/or modify
-# it under the terms of the zlib license. See the COPYING file.
+# it under the terms of the GPL-3.0+ license. See the COPYING file.
 """
 Various methods to convert
 shell colors to poezio colors,

setup.py

@@ -125,8 +125,8 @@ setup(
     long_description=LONG_DESCRIPTION,
     ext_modules=[module_poopt],
     url='https://poez.io/',
-    license='zlib',
-    download_url='https://poez.io/#download',
+    license='GPL-3.0-or-later',
+    download_url='https://dev.louiz.org/projects/poezio/files',
 
     author='Florent Le Coz',
     author_email='louiz@louiz.org',
@@ -139,7 +139,7 @@ setup(
         'Topic :: Internet :: XMPP',
         'Environment :: Console :: Curses',
         'Intended Audience :: End Users/Desktop',
-        'License :: OSI Approved :: zlib/libpng License',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: English',
         'Operating System :: Unix',
         'Programming Language :: Python :: 3.9',