# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1624033163 -7200
# Node ID 8dd5e1bac9c3e31377da96c297c5632bb53d649f
# Parent  813595f88612a921c1fcf33e3724155b61ad475f# Parent  87745bb92221ba19318748e57b33c56eef5bcfbc
merge changes from main branch

diff -r 813595f88612 -r 8dd5e1bac9c3 misc/README
--- a/misc/README	Thu Jun 17 13:05:58 2021 +0200
+++ b/misc/README	Fri Jun 18 18:19:23 2021 +0200
@@ -13,3 +13,9 @@
 
 * org.libervia.Libervia.service:
 	This file is used by D-Bus to know how to launch the backend, you have to put in in D-Bus services dir (usually /usr/share/dbus-1/services)
+
+* org.libervia.Libervia*.metainfo.xml:
+	AppStream metadata as specified at https://www.freedesktop.org/software/appstream/docs/
+
+* org.libervia.LiberviaTUI.desktop:
+	Desktop entry for TUI frontend as specified at https://specifications.freedesktop.org/desktop-entry-spec/
diff -r 813595f88612 -r 8dd5e1bac9c3 misc/org.libervia.LiberviaCLI.metainfo.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/org.libervia.LiberviaCLI.metainfo.xml	Fri Jun 18 18:19:23 2021 +0200
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?>
+<component type="console-application">
+  <!--
+    Copyright 2018-2021 Jérôme Poisson <goffi@goffi.org>
+
+    Copying and distribution of this file, with or without modification,
+    are permitted in any medium without royalty provided the copyright
+    notice and this notice are preserved.  This file is offered as-is,
+    without any warranty.
+    -->
+  <id>org.libervia.LiberviaCLI</id>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>AGPL-3.0-or-later</project_license>
+  <name>Libervia CLI (jp)</name>
+  <summary>Multi-purpose communication ecosystem (CLI frontend) - XMPP standard</summary>
+  <categories>
+    <category>Network</category>
+    <category>Chat</category>
+    <category>FileTransfer</category>
+    <category>ConsoleOnly</category>
+  </categories>
+  <description>
+    <p>Libervia is a multi-purpose communication ecosystem.</p>
+    <p>It offers many tools to communicate and collaborate (instant messaging, blogging, file sharing, photos albums, forums, events, etc.).
+        It is multi-purposes, but also multi-frontends (you can use it on desktop, mobile devices, web browser, or terminal) and multi-platforms.</p>
+    <p>Libervia is made with a strong sense of ethics (see social contract), is decentralized (you can run your own service, keep your important data yourself, while still being able to communicate with the rest of the network), and use a standard communication protocol (XMPP), making it compatible with many other software.</p>
+    <p>This part is the Command Line Interface frontend. You can use it to work with any XMPP based service, do scripts, etc. A REPL shell is included.</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <caption>The list of room commands seen</caption>
+      <image>https://repos.goffi.org/sat_docs/raw-file/tip/screenshots/0.7/jp_commands_list.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>REPL shell used to retrieve last blog post</caption>
+      <image>https://repos.goffi.org/sat_docs/raw-file/tip/screenshots/0.7/jp_shell_blog.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://salut-a-toi.org</url>
+  <url type="bugtracker">https://bugs.goffi.org</url>
+  <project_group>Libervia</project_group>
+  <provides>
+    <binary>libervia-cli</binary>
+  </provides>
+  <releases>
+    <release date="2019-07-24" type="stable" version="0.7.0">
+      <description>
+        <p>"La Commune" release.</p>
+        <p>This version is the first "general audience" one, and introduce Cagou (desktop/mobile interface), OMEMO end-to-end encryption, advanced file sharing, and many other features.</p>
+      </description>
+      <url>https://www.goffi.org/b/N29CuUQS4U4TK36JFuTQ5Q/salut-commune</url>
+    </release>
+  </releases>
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-chat">intense</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+    <content_attribute id="social-contacts">intense</content_attribute>
+  </content_rating>
+</component>
diff -r 813595f88612 -r 8dd5e1bac9c3 misc/org.libervia.LiberviaTUI.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/org.libervia.LiberviaTUI.desktop	Fri Jun 18 18:19:23 2021 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Libervia TUI (Primitivus)
+Comment=console frontend for Libervia (XMPP)
+Exec=libervia-tui
+Icon=org.libervia.LiberviaTUI
+Categories=Network;InstantMessaging;Chat;FileTransfer;RemoteAccess;
+Keywords=xmpp;chat;messaging;im;file;sharing;communication;jabber;social;network;decentralization;console;
diff -r 813595f88612 -r 8dd5e1bac9c3 misc/org.libervia.LiberviaTUI.metainfo.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/org.libervia.LiberviaTUI.metainfo.xml	Fri Jun 18 18:19:23 2021 +0200
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='utf-8'?>
+<component type="console-application">
+  <!--
+    Copyright 2018-2021 Jérôme Poisson <goffi@goffi.org>
+
+    Copying and distribution of this file, with or without modification,
+    are permitted in any medium without royalty provided the copyright
+    notice and this notice are preserved.  This file is offered as-is,
+    without any warranty.
+    -->
+  <id>org.libervia.LiberviaTUI</id>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>AGPL-3.0-or-later</project_license>
+  <name>Libervia TUI (Primitivus)</name>
+  <summary>Multi-purpose communication ecosystem (TUI frontend) - XMPP standard</summary>
+  <categories>
+    <category>Network</category>
+    <category>Chat</category>
+    <category>FileTransfer</category>
+    <category>ConsoleOnly</category>
+  </categories>
+  <description>
+    <p>Libervia is a multi-purpose communication ecosystem.</p>
+    <p>It offers many tools to communicate and collaborate (instant messaging, blogging, file sharing, photos albums, forums, events, etc.).
+        It is multi-purposes, but also multi-frontends (you can use it on desktop, mobile devices, web browser, or terminal) and multi-platforms.</p>
+    <p>Libervia is made with a strong sense of ethics (see social contract), is decentralized (you can run your own service, keep your important data yourself, while still being able to communicate with the rest of the network), and use a standard communication protocol (XMPP), making it compatible with many other software.</p>
+    <p>This part is the Terminal User Interface frontend.</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <caption>A chat conversation seen with Primitivus</caption>
+      <image>https://repos.goffi.org/sat_docs/raw-file/tip/screenshots/0.7/primitivus_chat.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://salut-a-toi.org</url>
+  <url type="bugtracker">https://bugs.goffi.org</url>
+  <project_group>Libervia</project_group>
+  <provides>
+    <binary>libervia-tui</binary>
+  </provides>
+  <releases>
+    <release date="2019-07-24" type="stable" version="0.7.0">
+      <description>
+        <p>"La Commune" release.</p>
+        <p>This version is the first "general audience" one, and introduce Cagou (desktop/mobile interface), OMEMO end-to-end encryption, advanced file sharing, and many other features.</p>
+      </description>
+      <url>https://www.goffi.org/b/N29CuUQS4U4TK36JFuTQ5Q/salut-commune</url>
+    </release>
+  </releases>
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-chat">intense</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+    <content_attribute id="social-contacts">intense</content_attribute>
+  </content_rating>
+</component>
diff -r 813595f88612 -r 8dd5e1bac9c3 setup.py
--- a/setup.py	Thu Jun 17 13:05:58 2021 +0200
+++ b/setup.py	Fri Jun 18 18:19:23 2021 +0200
@@ -20,38 +20,40 @@
 from setuptools import setup, find_packages
 import os
 
-NAME = 'sat'
+NAME = "libervia-backend"
+# NOTE: directory is still "sat" for compatibility reason, should be changed for 0.9
+DIR_NAME = "sat"
 
 install_requires = [
-    'babel',
-    'dbus-python',
-    'html2text',
+    'babel < 3',
+    'dbus-python < 1.3',
+    'html2text < 2020.2',
     'jinja2>=2.10.3',
-    'langid',
+    'langid < 2',
     'lxml >= 3.1.0',
     'markdown >= 3.0',
-    'miniupnpc',
-    'mutagen',
-    'netifaces',
+    'miniupnpc < 2.1',
+    'mutagen < 2',
+    'netifaces < 0.12',
     'pillow >= 6.0.0',
-    'progressbar2',
-    'cryptography',
-    'pygments',
-    'pygobject',
-    'pyopenssl',
-    'python-dateutil',
-    'python-potr',
-    'pyxdg',
-    'sat_tmp >= 0.7.0a4',
-    'shortuuid',
-    'twisted[tls] >= 20.3.0',
-    'treq',
-    'urwid >= 1.2.0',
-    'urwid-satext >= 0.7.0a2',
-    'wokkel >= 0.7.1',
-    'omemo >= 0.11.0',
-    'omemo-backend-signal',
-    'pyyaml',
+    'progressbar2 < 3.54',
+    'cryptography < 3.5',
+    'pygments < 3',
+    'pygobject < 3.40.1',
+    'pyopenssl < 21.0.0',
+    'python-dateutil < 3',
+    'python-potr < 1.1',
+    'pyxdg < 0.30',
+    'sat_tmp >= 0.8.0b1, < 0.9',
+    'shortuuid < 1.1',
+    'twisted[tls] >= 20.3.0, < 21.3.0',
+    'treq < 22.0.0',
+    'urwid >= 1.2.0, < 3',
+    'urwid-satext >= 0.8.0b1, < 0.9',
+    'wokkel >= 18.0.0, < 19.0.0',
+    'omemo >= 0.11.0, < 0.13.0',
+    'omemo-backend-signal < 0.3',
+    'pyyaml < 5.5.0',
     'sqlalchemy >= 1.4',
     'aiosqlite',
     'txdbus'
@@ -63,7 +65,7 @@
 
 DBUS_DIR = 'dbus-1/services'
 DBUS_FILE = 'misc/org.libervia.Libervia.service'
-with open(os.path.join(NAME, 'VERSION')) as f:
+with open(os.path.join(DIR_NAME, 'VERSION')) as f:
     VERSION = f.read().strip()
 is_dev_version = VERSION.endswith('D')
 if is_dev_version:
@@ -140,4 +142,4 @@
     extras_require=extras_require,
     package_data={"sat": ["VERSION"]},
     python_requires=">=3.7",
-)
+)
\ No newline at end of file