Mercurial > libervia-backend
changeset 2004:99ec7b66daa9
merged 0.6.1 bookmark. This bookmark (0.7-dev) is now the main one
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Fri, 15 Jul 2016 22:05:45 +0200 |
| parents | b5ef9b2b995e (current diff) b075c5a576ef (diff) |
| children | 2afd5bd781ef |
| files | src/core/constants.py |
| diffstat | 6 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 11 19:22:40 2016 +0200 +++ b/.hgtags Fri Jul 15 22:05:45 2016 +0200 @@ -9,3 +9,4 @@ a090e5ee83c2c2d9d110c7516c3d74573426a97b SàT v0.5.0 008c8ccd5dcc4c47578ee7190e6823186720c864 SàT v0.5.1 21e6d11615eaeb7e03bacf4eb53e5c3c5d54ce08 0.6.0 +3a16a747966035b8e6ac04f0e3d31669ca9eff91 0.6.1
--- a/CHANGELOG Mon Jul 11 19:22:40 2016 +0200 +++ b/CHANGELOG Fri Jul 15 22:05:45 2016 +0200 @@ -1,6 +1,6 @@ All theses changelogs are not exhaustive, please check the mercurial repository for more details. -v 0.6.1 (xx/xx/2016): +v 0.6.1 (12/07/2016): - minimum Twisted version is now 15.2.0 - removed pyfeed and xe dependencies - added mutagen to recommended in README4PACKAGERS
--- a/MANIFEST.in Mon Jul 11 19:22:40 2016 +0200 +++ b/MANIFEST.in Fri Jul 15 22:05:45 2016 +0200 @@ -5,6 +5,8 @@ global-include CHANGELOG COPYING* INSTALL README* global-include *.sh include src/sat.* +include misc include frontends/src/jp/jp frontends/src/primitivus/primitivus include src/bridge/bridge_constructor/mediawiki_template.tpl +global-exclude *.un~ prune src/bridge/bridge_constructor/generated
--- a/README Mon Jul 11 19:22:40 2016 +0200 +++ b/README Fri Jul 15 22:05:45 2016 +0200 @@ -1,4 +1,4 @@ -SàT v0.6.0 +SàT v0.6.1 (c) Jérôme Poisson aka Goffi 2008-2016 (c) Adrien Cossa aka Souliane 2013-2016
--- a/README4PACKAGERS Mon Jul 11 19:22:40 2016 +0200 +++ b/README4PACKAGERS Fri Jul 15 22:05:45 2016 +0200 @@ -28,7 +28,7 @@ XDG zope.interface -Recommended: Mutagen, markdown, html2text, netifaces, miniupnp +Recommended: Mutagen, markdown, html2text, netifaces, miniupnp, service-identity -------------------------------- Dependencies for the Jp frontend @@ -43,7 +43,7 @@ ---------------------------------------- Urwid >= 1.2.0 -Urwid-satext >= 0.4.1 +Urwid-satext >= 0.6.1 GObject 2 (not imported directly in Primitivus, but needed for Urwid's main loop) DBus @@ -74,7 +74,7 @@ - Urwid SàText: Widgets for urwid library, designed for SàT but can be useful for other projects. Mandatory for Primitivus. -The following ones are not needed in a distribution, because they are in too early a stage of development, or not useful for general purpose: +The following ones are not needed in a distribution, because they are in a too early stage of development, or not useful for general purpose: - Bellaciao: a Qt frontend, at an early stage of development.
--- a/setup.py Mon Jul 11 19:22:40 2016 +0200 +++ b/setup.py Fri Jul 15 22:05:45 2016 +0200 @@ -279,7 +279,7 @@ preinstall_check(install_opt) setup(name=NAME, - version='0.6.0', + version='0.6.1.1', description=u'Salut à Toi multi-frontend XMPP client', long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. Its multi-frontends (desktop, web, console interface, CLI, etc) and multi-purposes (instant messaging, microblogging, games, file sharing, etc).', author='Association « Salut à Toi »', @@ -304,6 +304,6 @@ ], scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', ], zip_safe=False, - install_requires=['twisted >= 15.2.0', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.4.0', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL'], + install_requires=['twisted >= 15.2.0', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.6.1', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL', 'service_identity'], cmdclass={'install': CustomInstall}, )