Commit 8bf94312 authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud

migration: rename ring-gnome to jami-gnome

Change-Id: I4022846de7e0fa1f2a3bf14ffe0a961920379580
parent 87b7ad8f
...@@ -176,7 +176,7 @@ OSX_UNINSTALL_SCRIPT = [ ...@@ -176,7 +176,7 @@ OSX_UNINSTALL_SCRIPT = [
STOP_SCRIPT = [ STOP_SCRIPT = [
'xargs kill < daemon.pid', 'xargs kill < daemon.pid',
'xargs kill < gnome-ring.pid', 'xargs kill < jami-gnome.pid',
] ]
...@@ -330,16 +330,16 @@ def run_run(args): ...@@ -330,16 +330,16 @@ def run_run(args):
with open('daemon.pid', 'w') as f: with open('daemon.pid', 'w') as f:
f.write(str(dring_process.pid)+'\n') f.write(str(dring_process.pid)+'\n')
client_log = open("gnome-ring.log", 'a') client_log = open("jami-gnome.log", 'a')
client_log.write('=== Starting client (%s) ===' % time.strftime("%d/%m/%Y %H:%M:%S")) client_log.write('=== Starting client (%s) ===' % time.strftime("%d/%m/%Y %H:%M:%S"))
client_process = subprocess.Popen( client_process = subprocess.Popen(
["./install/client-gnome/bin/gnome-ring", "-d"], ["./install/client-gnome/bin/jami-gnome", "-d"],
stdout=client_log, stdout=client_log,
stderr=client_log, stderr=client_log,
env=run_env env=run_env
) )
with open('gnome-ring.pid', 'w') as f: with open('jami-gnome.pid', 'w') as f:
f.write(str(client_process.pid)+'\n') f.write(str(client_process.pid)+'\n')
if args.debug: if args.debug:
......
client-gnome/doc/gnome-ring.1 client-gnome/doc/jami-gnome.1
daemon/dring.1 daemon/dring.1
...@@ -91,7 +91,7 @@ Description: Secure and distributed voice, video and chat platform - desktop cli ...@@ -91,7 +91,7 @@ Description: Secure and distributed voice, video and chat platform - desktop cli
platform that requires no centralized server and leaves the power of privacy platform that requires no centralized server and leaves the power of privacy
in the hands of the user. in the hands of the user.
. .
This package contains the desktop client: gnome-ring. This package contains the desktop client: jami-gnome.
Package: ring-daemon Package: ring-daemon
Architecture: any Architecture: any
......
client-gnome/doc/gnome-ring.1 client-gnome/doc/jami-gnome.1
daemon/dring.1 daemon/dring.1
client-gnome/doc/gnome-ring.1 client-gnome/doc/jami-gnome.1
...@@ -70,7 +70,7 @@ BuildRequires: libvdpau-devel ...@@ -70,7 +70,7 @@ BuildRequires: libvdpau-devel
Ring is free software for universal communication which respects freedoms Ring is free software for universal communication which respects freedoms
and privacy of its users. and privacy of its users.
. .
This package contains the desktop client: gnome-ring. This package contains the desktop client: jami-gnome.
%package daemon %package daemon
Summary: Free software for distributed and secured communication - daemon Summary: Free software for distributed and secured communication - daemon
...@@ -184,17 +184,17 @@ DESTDIR=%{buildroot} make -C client-gnome/build install ...@@ -184,17 +184,17 @@ DESTDIR=%{buildroot} make -C client-gnome/build install
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/ring.cx %{_bindir}/jami
%{_bindir}/gnome-ring %{_bindir}/jami-gnome
%{_libdir}/libringclient*.so* %{_libdir}/libringclient*.so*
%{_datadir}/glib-2.0/schemas/cx.ring.RingGnome.gschema.xml %{_datadir}/glib-2.0/schemas/net.jami.client.gnome.gschema.xml
%{_datadir}/applications/gnome-ring.desktop %{_datadir}/applications/jami-gnome.desktop
%{_datadir}/gnome-ring/gnome-ring.desktop %{_datadir}/jami-gnome/jami-gnome.desktop
%{_datadir}/icons/hicolor/scalable/apps/jami.svg %{_datadir}/icons/hicolor/scalable/apps/jami.svg
%{_datadir}/appdata/gnome-ring.appdata.xml %{_datadir}/metainfo/jami-gnome.appdata.xml
%{_datadir}/libringclient/* %{_datadir}/libringclient/*
%{_datadir}/locale/* %{_datadir}/locale/*
%{_datadir}/sounds/gnome-ring/* %{_datadir}/sounds/jami-gnome/*
%doc %{_mandir}/man1/dring* %doc %{_mandir}/man1/dring*
%files daemon %files daemon
......
...@@ -32,7 +32,7 @@ cd /var/lib/layman/ring-overlay && bash scripts/bump-ring-ebuilds.sh /usr/portag ...@@ -32,7 +32,7 @@ cd /var/lib/layman/ring-overlay && bash scripts/bump-ring-ebuilds.sh /usr/portag
# problem with cirrcular deps # problem with cirrcular deps
USE="-qt5" emerge -1 dev-util/cmake USE="-qt5" emerge -1 dev-util/cmake
emerge gnome-ring kde-ring emerge jami-gnome kde-ring
touch /opt/output/.packages-built touch /opt/output/.packages-built
chown -R ${CURRENT_UID}:${CURRENT_UID} /opt/output chown -R ${CURRENT_UID}:${CURRENT_UID} /opt/output
...@@ -13,7 +13,7 @@ sys-libs/ncurses docker-build ...@@ -13,7 +13,7 @@ sys-libs/ncurses docker-build
dev-libs/msgpack build-pkg dev-libs/msgpack build-pkg
net-libs/libringclient build-pkg net-libs/libringclient build-pkg
net-libs/opendht build-pkg net-libs/opendht build-pkg
net-voip/gnome-ring build-pkg net-voip/jami-gnome build-pkg
net-voip/kde-ring build-pkg net-voip/kde-ring build-pkg
net-voip/ring-daemon build-pkg net-voip/ring-daemon build-pkg
# overlay # overlay
net-voip/gnome-ring ~amd64 net-voip/jami-gnome ~amd64
=net-voip/kde-ring-99999999 ** =net-voip/kde-ring-99999999 **
net-libs/libringclient ~amd64 net-libs/libringclient ~amd64
net-voip/ring-daemon ~amd64 net-voip/ring-daemon ~amd64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment