# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1522739095 -7200
# Node ID ea106dfa214572bfedb104b18d3cee2853ddf77c
# Parent  6e5ab7bebd11516da3cab3aded710b4e984bdd81
setup, constant: use https address in APP_URL, and keep pypi NAME separated from constants

diff -r 6e5ab7bebd11 -r ea106dfa2145 sat/core/constants.py
--- a/sat/core/constants.py	Tue Apr 03 08:00:42 2018 +0200
+++ b/sat/core/constants.py	Tue Apr 03 09:04:55 2018 +0200
@@ -30,10 +30,11 @@
     APP_NAME = u'Salut à Toi'
     APP_NAME_SHORT = u'SàT'
     APP_NAME_FILE = u'sat'
-    APP_NAME_FULL = u'%s (%s)' % (APP_NAME_SHORT, APP_NAME)
+    APP_NAME_FULL = u'{name_short} ({name})'.format(name_short=APP_NAME_SHORT,
+                                                    name=APP_NAME)
     APP_VERSION = u'0.7.0D'  # Please add 'D' at the end for dev versions
     APP_RELEASE_NAME = u'La Commune'
-    APP_URL = u'http://salut-a-toi.org'
+    APP_URL = u'https://salut-a-toi.org'
 
 
     ## Runtime ##
diff -r 6e5ab7bebd11 -r ea106dfa2145 setup.py
--- a/setup.py	Tue Apr 03 08:00:42 2018 +0200
+++ b/setup.py	Tue Apr 03 09:04:55 2018 +0200
@@ -53,17 +53,17 @@
     'wokkel >= 0.7.1',
 ]
 
-
 DBUS_DIR = 'dbus-1/services'
 DBUS_FILE = 'misc/org.goffi.SAT.service'
 
-setup(name=C.APP_NAME_FILE,
+
+setup(name=NAME,
       version=C.APP_VERSION,
       description=u'Salut à Toi multipurpose and multi frontend XMPP client',
       long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi frontend (desktop, web, console interface, CLI, etc) and multipurpose (instant messaging, microblogging, games, file sharing, etc).',
       author='Association « Salut à Toi »',
       author_email='contact@goffi.org',
-      url='https://salut-a-toi.org',
+      url=C.APP_URL,
       classifiers=['Development Status :: 3 - Alpha',
                    'Environment :: Console',
                    'Framework :: Twisted',