Update setup.py (from what was changed for the pypi release)

also remove old stuff from the default config

2 files changed, 16 insertions, 12 deletions

diff --git a/data/default_config.cfg b/data/default_config.cfg
index 17d74745..7cae354e 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -142,11 +142,6 @@ words =
 # XHTML-IM is an XMPP extension letting users send messages
 # containing XHTML and CSS formating. We can use this to make
 # colored text for example.
-# It is disabled by default because this is only in an experimental
-# state: you could miss some part of a message (mainly the URL)
-# but you can still send colored messages. You just won’t be able te see
-# the colors, though
-# Set to true if you want to see colored messages
 enable_xhtml_im = true
 
 # Set a number for this setting.
diff --git a/setup.py b/setup.py
index 92846610..7fec5b92 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 from distutils.core import setup, Extension
 import os, sys
 
@@ -17,13 +18,16 @@ setup(name="poezio",
        version="0.8.3-dev",
        description="A console XMPP client",
        long_description=
-       """
-       Poezio is a Free chat client aiming to reproduce the ease of use of most
-       IRC clients (e.g. weechat, irssi) while using the XMPP network.
-       """,
+       "Poezio is a Free chat client aiming to reproduce the ease of use of most "
+       "IRC clients (e.g. weechat, irssi) while using the XMPP network."
+       "\n"
+       "Documentation is available at http://doc.poez.io/0.8.",
+
+
        ext_modules = [module_poopt],
-       url = 'http://poezio.eu/',
+       url = 'http://poez.io/',
        license = 'zlib',
+       download_url = 'https://dev.louiz.org/projects/poezio/files',
 
        author = 'Florent Le Coz',
        author_email = 'louiz@louiz.org',
@@ -32,13 +36,13 @@ setup(name="poezio",
        maintainer_email = 'mathieui@mathieui.net',
 
        classifiers = ['Development Status :: 2 - Pre-Alpha',
+                       'Topic :: Communications :: Chat',
                        'Environment :: Console :: Curses',
                        'Intended Audience :: End Users/Desktop',
                        'License :: OSI Approved :: zlib/libpng License',
                        'Natural Language :: English',
                        'Operating System :: Unix',
-                       'Topic :: Communications :: Chat',
-                       'Programming Language :: Python :: 3',
+                       'Programming Language :: Python :: 3'
                     ],
        keywords = ['jabber', 'xmpp', 'client', 'chat', 'im', 'console'],
        packages = ['poezio', 'poezio_plugins', 'poezio_plugins.gpg', 'poezio_themes'],
@@ -46,6 +50,11 @@ setup(name="poezio",
        package_data = {'poezio': ['default_config.cfg']},
        scripts = ['scripts/poezio', 'scripts/poezio_gpg_export'],
        data_files = [('share/man/man1/', ['data/poezio.1'])],
+
+       install_requires = ['sleekxmpp==1.2.4',
+                           'dnspython3>=1.11.1'],
+       extras_require = {'OTR plugin': 'python-potr>=1.0',
+                         'Screen autoaway plugin': 'pyinotify==0.9.4'}
 )
 
 # Remove the link afterwards