diff --git a/make-ring.py b/make-ring.py index f36a1f7f0a4ddd95c5b06caac093ad154e2d0e79..b5eafa8f7384b763470eb45c5e7848a4fdf2b43e 100755 --- a/make-ring.py +++ b/make-ring.py @@ -176,7 +176,7 @@ OSX_UNINSTALL_SCRIPT = [ STOP_SCRIPT = [ 'xargs kill < daemon.pid', - 'xargs kill < gnome-ring.pid', + 'xargs kill < jami-gnome.pid', ] @@ -330,16 +330,16 @@ def run_run(args): with open('daemon.pid', 'w') as f: 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_process = subprocess.Popen( - ["./install/client-gnome/bin/gnome-ring", "-d"], + ["./install/client-gnome/bin/jami-gnome", "-d"], stdout=client_log, stderr=client_log, 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') if args.debug: diff --git a/packaging/rules/debian-one-click-install/ring-all.manpages b/packaging/rules/debian-one-click-install/ring-all.manpages index 87574cc4f9811456e1433a9d43e61e9dd72b8d95..5e0fefce5bde9b8f11ae15738a73d25d271474c0 100644 --- a/packaging/rules/debian-one-click-install/ring-all.manpages +++ b/packaging/rules/debian-one-click-install/ring-all.manpages @@ -1,2 +1,2 @@ -client-gnome/doc/gnome-ring.1 +client-gnome/doc/jami-gnome.1 daemon/dring.1 diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control index e90cd4a240e7f9907d05389778e790aa0e632430..df800480ec0bfd43f61e3c30aa044f018c8d8390 100644 --- a/packaging/rules/debian/control +++ b/packaging/rules/debian/control @@ -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 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 Architecture: any diff --git a/packaging/rules/debian/ring-all.manpages b/packaging/rules/debian/ring-all.manpages index 87574cc4f9811456e1433a9d43e61e9dd72b8d95..5e0fefce5bde9b8f11ae15738a73d25d271474c0 100644 --- a/packaging/rules/debian/ring-all.manpages +++ b/packaging/rules/debian/ring-all.manpages @@ -1,2 +1,2 @@ -client-gnome/doc/gnome-ring.1 +client-gnome/doc/jami-gnome.1 daemon/dring.1 diff --git a/packaging/rules/debian/ring.manpages b/packaging/rules/debian/ring.manpages index d920cbc08a6b62c7e0f00998eb5f0eef0357f97d..a1d1af97356a735b5fdf7a175cc988ff5bbdf602 100644 --- a/packaging/rules/debian/ring.manpages +++ b/packaging/rules/debian/ring.manpages @@ -1 +1 @@ -client-gnome/doc/gnome-ring.1 +client-gnome/doc/jami-gnome.1 diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec index 7391648aa04db6823f0430882678f1705769c010..6387e7a64e27da62828bef8165bc2ce30fc99f36 100644 --- a/packaging/rules/fedora/ring.spec +++ b/packaging/rules/fedora/ring.spec @@ -70,7 +70,7 @@ BuildRequires: libvdpau-devel Ring is free software for universal communication which respects freedoms and privacy of its users. . -This package contains the desktop client: gnome-ring. +This package contains the desktop client: jami-gnome. %package daemon Summary: Free software for distributed and secured communication - daemon @@ -184,17 +184,17 @@ DESTDIR=%{buildroot} make -C client-gnome/build install %files %defattr(-,root,root,-) -%{_bindir}/ring.cx -%{_bindir}/gnome-ring +%{_bindir}/jami +%{_bindir}/jami-gnome %{_libdir}/libringclient*.so* -%{_datadir}/glib-2.0/schemas/cx.ring.RingGnome.gschema.xml -%{_datadir}/applications/gnome-ring.desktop -%{_datadir}/gnome-ring/gnome-ring.desktop +%{_datadir}/glib-2.0/schemas/net.jami.client.gnome.gschema.xml +%{_datadir}/applications/jami-gnome.desktop +%{_datadir}/jami-gnome/jami-gnome.desktop %{_datadir}/icons/hicolor/scalable/apps/jami.svg -%{_datadir}/appdata/gnome-ring.appdata.xml +%{_datadir}/metainfo/jami-gnome.appdata.xml %{_datadir}/libringclient/* %{_datadir}/locale/* -%{_datadir}/sounds/gnome-ring/* +%{_datadir}/sounds/jami-gnome/* %doc %{_mandir}/man1/dring* %files daemon diff --git a/scripts/build-package-gentoo.sh b/scripts/build-package-gentoo.sh index 2bb4b6a23873081d1c3f7da3297497ec4c883812..e5082232836c9604afdc463f11153e70d6089a65 100644 --- a/scripts/build-package-gentoo.sh +++ b/scripts/build-package-gentoo.sh @@ -32,7 +32,7 @@ cd /var/lib/layman/ring-overlay && bash scripts/bump-ring-ebuilds.sh /usr/portag # problem with cirrcular deps USE="-qt5" emerge -1 dev-util/cmake -emerge gnome-ring kde-ring +emerge jami-gnome kde-ring touch /opt/output/.packages-built chown -R ${CURRENT_UID}:${CURRENT_UID} /opt/output diff --git a/scripts/gentoo/portage/package.env/ring b/scripts/gentoo/portage/package.env/ring index ff7cd17fc354d80090380f901afa43d315710ec2..eb42c7cadb2b692697f994e4e36343f7b1a4a2c0 100644 --- a/scripts/gentoo/portage/package.env/ring +++ b/scripts/gentoo/portage/package.env/ring @@ -13,7 +13,7 @@ sys-libs/ncurses docker-build dev-libs/msgpack build-pkg net-libs/libringclient 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/ring-daemon build-pkg diff --git a/scripts/gentoo/portage/package.keywords/ring b/scripts/gentoo/portage/package.keywords/ring index 8c80d2a1f6f7764b3f6a6bcedb20ce82fa347df4..b3dd4f2a52a081aecb373d8c8b135a4e24d95852 100644 --- a/scripts/gentoo/portage/package.keywords/ring +++ b/scripts/gentoo/portage/package.keywords/ring @@ -1,5 +1,5 @@ # overlay -net-voip/gnome-ring ~amd64 +net-voip/jami-gnome ~amd64 =net-voip/kde-ring-99999999 ** net-libs/libringclient ~amd64 net-voip/ring-daemon ~amd64