Merging upstream version 2.1.1 (Closes: #1026291).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 77 insertions, 67 deletions

diff --git a/PKG-INFO b/PKG-INFO
index 3188609..1a9fda1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deluge
-Version: 2.0.3
+Version: 2.1.1
 Summary: BitTorrent Client
 Home-page: https://deluge-torrent.org
 Author: Deluge Team
@@ -12,72 +12,7 @@ Project-URL: Sourcecode, http://git.deluge-torrent.org/deluge
 Project-URL: Issues, https://dev.deluge-torrent.org/report/1
 Project-URL: Discussion, https://forum.deluge-torrent.org
 Project-URL: Documentation, https://deluge.readthedocs.io
-Description: # Deluge BitTorrent Client
-        
-        [![build-status]][travis-deluge] [![docs-status]][rtd-deluge]
-        
-        Deluge is a BitTorrent client that utilizes a daemon/client model.
-        It has various user interfaces available such as the GTK-UI, Web-UI and
-        a Console-UI. It uses [libtorrent][lt] at it's core to handle the BitTorrent
-        protocol.
-        
-        ## Install
-        
-        From [PyPi](https://pypi.org/project/deluge):
-        
-            pip install deluge
-        
-        From source code:
-        
-            python setup.py build
-            python setup.py install
-        
-        See [DEPENDS](DEPENDS.md) and [Installing/Source] for dependency details.
-        
-        ## Usage
-        
-        The various user-interfaces and Deluge daemon can be started with the following commands.
-        
-        Use the `--help` option for further command options.
-        
-        ### Gtk UI
-        
-        `deluge` or `deluge-gtk`
-        
-        ### Console UI
-        
-        `deluge-console`
-        
-        ### Web UI
-        
-        `deluge-web`
-        
-        Open http://localhost:8112 with default password `deluge`.
-        
-        ### Daemon
-        
-        `deluged`
-        
-        See the [Thinclient guide] to connect to the daemon from another computer.
-        
-        ## Contact
-        
-        - [Homepage](https://deluge-torrent.org)
-        - [User guide][user guide]
-        - [Forum](https://forum.deluge-torrent.org)
-        - [IRC Freenode #deluge](irc://irc.freenode.net/deluge)
-        
-        [user guide]: https://dev.deluge-torrent.org/wiki/UserGuide
-        [thinclient guide]: https://dev.deluge-torrent.org/wiki/UserGuide/ThinClient
-        [installing/source]: https://dev.deluge-torrent.org/wiki/Installing/Source
-        [build-status]: https://travis-ci.org/deluge-torrent/deluge.svg "Travis Status"
-        [travis-deluge]: https://travis-ci.org/deluge-torrent/deluge
-        [docs-status]: https://readthedocs.org/projects/deluge/badge/?version=develop
-        [rtd-deluge]: https://deluge.readthedocs.io/en/develop/?badge=develop "Documentation Status"
-        [lt]: https://libtorrent.org
-        
 Keywords: torrent bittorrent p2p fileshare filesharing
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -90,5 +25,80 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Topic :: Internet
-Requires-Python: >=2.7
+Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+Provides-Extra: all
+License-File: LICENSE
+License-File: AUTHORS
+
+# Deluge BitTorrent Client
+
+[![build-status]][github-ci] [![docs-status]][rtd-deluge]
+
+Deluge is a BitTorrent client that utilizes a daemon/client model.
+It has various user interfaces available such as the GTK-UI, Web-UI and
+Console-UI. It uses [libtorrent][lt] at its core to handle the BitTorrent
+protocol.
+
+## Install
+
+From [PyPi](https://pypi.org/project/deluge):
+
+    pip install deluge
+
+with all optional dependencies:
+
+    pip install deluge[all]
+
+From source code:
+
+    pip install .
+
+with all optional dependencies:
+
+    pip install .[all]
+
+See [DEPENDS](DEPENDS.md) and [Installing/Source] for dependency details.
+
+## Usage
+
+The various user-interfaces and Deluge daemon can be started with the following commands.
+
+Use the `--help` option for further command options.
+
+### Gtk UI
+
+`deluge` or `deluge-gtk`
+
+### Console UI
+
+`deluge-console`
+
+### Web UI
+
+`deluge-web`
+
+Open http://localhost:8112 with default password `deluge`.
+
+### Daemon
+
+`deluged`
+
+See the [Thinclient guide] to connect to the daemon from another computer.
+
+## Contact
+
+- [Homepage](https://deluge-torrent.org)
+- [User guide][user guide]
+- [Forum](https://forum.deluge-torrent.org)
+- [IRC Libera.Chat #deluge](irc://irc.libera.chat/deluge)
+- [Discord](https://discord.gg/nwaHSE6tqn)
+
+[user guide]: https://dev.deluge-torrent.org/wiki/UserGuide
+[thinclient guide]: https://dev.deluge-torrent.org/wiki/UserGuide/ThinClient
+[installing/source]: https://dev.deluge-torrent.org/wiki/Installing/Source
+[build-status]: https://github.com/deluge-torrent/deluge/actions/workflows/ci.yml/badge.svg?branch=develop "CI"
+[github-ci]: https://github.com/deluge-torrent/deluge/actions/workflows/ci.yml
+[docs-status]: https://readthedocs.org/projects/deluge/badge/?version=latest
+[rtd-deluge]: https://deluge.readthedocs.io/en/latest/?badge=latest "Documentation Status"
+[lt]: https://libtorrent.org