From 14c817fa2c0a8eb73925f4c0e9cb959a3552a85c Mon Sep 17 00:00:00 2001
From: Goffi <goffi@goffi.org>
Date: Tue, 3 Apr 2018 09:04:55 +0200
Subject: [PATCH] setup, constant: use https address in APP_URL, and keep pypi
 NAME separated from constants

---
 sat/core/constants.py | 5 +++--
 setup.py              | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sat/core/constants.py b/sat/core/constants.py
index db7240bf..abdc2d99 100644
--- a/sat/core/constants.py
+++ b/sat/core/constants.py
@@ -30,10 +30,11 @@ class Const(object):
     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 --git a/setup.py b/setup.py
index 292c3ede..1c1f78b2 100644
--- a/setup.py
+++ b/setup.py
@@ -53,17 +53,17 @@ install_requires = [
     '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',