# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1532028194 -7200
# Node ID 7272eafd0fadf1a83fe0f702181a84f9bdc1880c
# Parent  4549cf265131e53240a343c76534a0bfdb15f1e2
Backed out changeset 4549cf265131

The hack to avoid launching the backend is not clean, and can confuse user if a frontend is removed. Doesn't seem like a sane solution.

diff -r 4549cf265131 -r 7272eafd0fad flatpak/org.salutatoi.Cagou.json
--- a/flatpak/org.salutatoi.Cagou.json	Sun Jul 15 16:56:55 2018 +0200
+++ b/flatpak/org.salutatoi.Cagou.json	Thu Jul 19 21:23:14 2018 +0200
@@ -11,9 +11,7 @@
         "--share=ipc",
         "--socket=wayland",
         "--share=network",
-        "--filesystem=home",
-        "--socket=session-bus",
-        "--own-name=org.salutatoi.SAT"
+        "--filesystem=home"
     ],
     "modules": [
         {
@@ -206,8 +204,7 @@
             "name": "cagou",
             "buildsystem": "simple",
             "build-commands": [
-                "python2 setup.py install --prefix=/app",
-                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
+                "python2 setup.py install --prefix=/app"
             ],
             "sources": [
                 {
diff -r 4549cf265131 -r 7272eafd0fad flatpak/org.salutatoi.Jp.json
--- a/flatpak/org.salutatoi.Jp.json	Sun Jul 15 16:56:55 2018 +0200
+++ b/flatpak/org.salutatoi.Jp.json	Thu Jul 19 21:23:14 2018 +0200
@@ -6,18 +6,16 @@
     "sdk": "org.salutatoi.Sdk",
     "command": "jp",
     "finish-args": [
+        "--socket=session-bus",
         "--share=network",
-        "--filesystem=home",
-        "--socket=session-bus",
-        "--own-name=org.salutatoi.SAT"
+        "--filesystem=home"
     ],
     "modules": [
         {
             "name": "jp",
             "buildsystem": "simple",
             "build-commands": [
-                "install -D /usr/bin/jp /app/bin/jp",
-                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
+                "install -D /usr/bin/jp /app/bin/jp"
             ]
         }
     ]
diff -r 4549cf265131 -r 7272eafd0fad flatpak/org.salutatoi.Libervia.json
--- a/flatpak/org.salutatoi.Libervia.json	Sun Jul 15 16:56:55 2018 +0200
+++ b/flatpak/org.salutatoi.Libervia.json	Thu Jul 19 21:23:14 2018 +0200
@@ -5,10 +5,9 @@
     "sdk": "org.salutatoi.Sdk",
     "command": "libervia",
     "finish-args": [
+        "--socket=session-bus",
         "--share=network",
-        "--filesystem=home",
-        "--socket=session-bus",
-        "--own-name=org.salutatoi.SAT"
+        "--filesystem=home"
     ],
     "modules": [
         {
@@ -80,8 +79,7 @@
             "buildsystem": "simple",
             "build-commands": [
                 "python2 bootstrap.py",
-                "cd /app/lib/python2.7/site-packages/libervia/browser && /run/build/python2-pyjamas/bin/pyjsbuild libervia_main.py --no-compile-inplace -o /app/share/libervia/html",
-                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
+                "cd /app/lib/python2.7/site-packages/libervia/browser && /run/build/python2-pyjamas/bin/pyjsbuild libervia_main.py --no-compile-inplace -o /app/share/libervia/html"
             ],
             "sources": [
                 {
diff -r 4549cf265131 -r 7272eafd0fad flatpak/org.salutatoi.Primitivus.json
--- a/flatpak/org.salutatoi.Primitivus.json	Sun Jul 15 16:56:55 2018 +0200
+++ b/flatpak/org.salutatoi.Primitivus.json	Thu Jul 19 21:23:14 2018 +0200
@@ -6,18 +6,14 @@
     "sdk": "org.salutatoi.Sdk",
     "command": "primitivus",
     "finish-args": [
-        "--share=network",
-        "--filesystem=home",
-        "--socket=session-bus",
-        "--own-name=org.salutatoi.SAT"
+        "--socket=session-bus"
     ],
     "modules": [
         {
             "name": "primitivus",
             "buildsystem": "simple",
             "build-commands": [
-                "install -D /usr/bin/primitivus /app/bin/primitivus",
-                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
+                "install -D /usr/bin/primitivus /app/bin/primitivus"
             ]
         }
     ]
diff -r 4549cf265131 -r 7272eafd0fad flatpak/org.salutatoi.SAT.json
--- a/flatpak/org.salutatoi.SAT.json	Sun Jul 15 16:56:55 2018 +0200
+++ b/flatpak/org.salutatoi.SAT.json	Thu Jul 19 21:23:14 2018 +0200
@@ -7,8 +7,7 @@
     "command": "sat",
     "finish-args": [
         "--share=network",
-        "--filesystem=home",
-        "--socket=session-bus"
+        "--filesystem=home"
     ],
     "modules": [
         {