diff --git a/build.py b/build.py
index 6a40f1dba23b952b107384ad6e718df5fb3e0afc..f0adde1d1733c348abd18fd8568c37275bf3d5a9 100755
--- a/build.py
+++ b/build.py
@@ -469,17 +469,17 @@ def run_run(args):
'LD_LIBRARY_PATH', '') + ":install/lrc/lib"
try:
- dring_log = open("daemon.log", 'a')
- dring_log.write('=== Starting daemon (%s) ===' %
+ jamid_log = open("daemon.log", 'a')
+ jamid_log.write('=== Starting daemon (%s) ===' %
time.strftime("%d/%m/%Y %H:%M:%S"))
- dring_process = subprocess.Popen(
+ jamid_process = subprocess.Popen(
["./install/daemon/libexec/jamid", "-c", "-d"],
- stdout=dring_log,
- stderr=dring_log
+ stdout=jamid_log,
+ stderr=jamid_log
)
with open('daemon.pid', 'w') as f:
- f.write(str(dring_process.pid)+'\n')
+ f.write(str(jamid_process.pid)+'\n')
client_suffix = ""
if args.qt is not None:
@@ -504,7 +504,7 @@ def run_run(args):
subprocess.call(['gdb', './install/daemon/libexec/jamid'])
if not args.background:
- dring_process.wait()
+ jamid_process.wait()
client_process.wait()
except KeyboardInterrupt:
@@ -516,9 +516,9 @@ def run_run(args):
# Only kill the processes if they are running, as they could
# have been closed by the user.
print("Killing processes...")
- dring_log.close()
- if dring_process.poll() is None:
- dring_process.kill()
+ jamid_log.close()
+ if jamid_process.poll() is None:
+ jamid_process.kill()
client_log.close()
if client_process.poll() is None:
client_process.kill()
diff --git a/docs/source/dev/compiling_and_installing/daemon.rst b/docs/source/dev/compiling_and_installing/daemon.rst
index 79548a92ef6c2d0b6854c6d49b0521446884b3cd..2f0e9798e2b6c58d0b281fe0ef18d23f5284814e 100644
--- a/docs/source/dev/compiling_and_installing/daemon.rst
+++ b/docs/source/dev/compiling_and_installing/daemon.rst
@@ -15,7 +15,7 @@ Linux
../bootstrap
make
-2. Compiling dring
+2. Compiling jamid
------------------
.. code-block:: bash
@@ -25,7 +25,7 @@ Linux
./configure
make
-3. Installing dring
+3. Installing jamid
-------------------
.. code-block:: bash
@@ -96,7 +96,7 @@ Run: ``brew link --force gettext`` to fix it.
Clang compatibility (developers only)
-------------------------------------
-It is possible to compile dring with Clang by setting CC and CXX variables
+It is possible to compile jamid with Clang by setting CC and CXX variables
to 'clang' and 'clang++' respectively when calling ./configure.
Currently it is not possible to use the DBus interface mechanism, and the
diff --git a/packaging/rules/debian/control b/packaging/rules/debian/control
index 43a666c2b14f288f50eaae244aad3b06033765e1..a3d4a4b713f8dc3acff64e6f528ebc0c02ef069b 100644
--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -139,4 +139,4 @@ Description: Secure and distributed voice, video and chat platform - daemon
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
- This package contains the Jami daemon: dring.
+ This package contains the Jami daemon: jamid.
diff --git a/packaging/rules/debian/copyright b/packaging/rules/debian/copyright
index 094997c7e3fd10e3d5d2803e224535aeacabb2d2..43aecf3bf04aeadd7029b9333a86a23ddfc58815 100644
--- a/packaging/rules/debian/copyright
+++ b/packaging/rules/debian/copyright
@@ -73,8 +73,8 @@ Copyright: 2008 Benjamin Kosnik <bkoz@redhat.com>
2007-2010 Josh Triplett <josh@joshtriplett.org>
License: GNUAllPermissive
-Files: daemon/tools/dringctrl/sippwrap.py
- daemon/tools/dringctrl/test_dring_dbus_interface.py
+Files: daemon/tools/jamidctrl/sippwrap.py
+ daemon/tools/jamidctrl/test_jamid_dbus_interface.py
Copyright: 2012 Free Software Foundation, Inc.
License: GPL-2+
diff --git a/packaging/rules/debian/jami-all.manpages b/packaging/rules/debian/jami-all.manpages
index 5e0fefce5bde9b8f11ae15738a73d25d271474c0..a2e889dda716131b3ec84970ca47088c617614f1 100644
--- a/packaging/rules/debian/jami-all.manpages
+++ b/packaging/rules/debian/jami-all.manpages
@@ -1,2 +1,2 @@
client-gnome/doc/jami-gnome.1
-daemon/dring.1
+daemon/jamid.1
diff --git a/packaging/rules/debian/jami-daemon.manpages b/packaging/rules/debian/jami-daemon.manpages
index 69e23e278d06cdced40aa35501275873cf7d1dcf..857be47ff4fcc76d264fb29fb67ea607b54b8013 100644
--- a/packaging/rules/debian/jami-daemon.manpages
+++ b/packaging/rules/debian/jami-daemon.manpages
@@ -1 +1 @@
-daemon/dring.1
+daemon/jamid.1
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index 040a779be6a8431bb5f231684df35ec9a1867ebe..de15c8c19c73cd5286e414de9633380bc0379f68 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -117,7 +117,7 @@ override_dh_auto_build:
## Daemon build ##
#######################
make -C daemon -j$(NO_CPUS) V=1
- pod2man daemon/man/dring.pod > daemon/dring.1
+ pod2man daemon/man/jamid.pod > daemon/jamid.1
#########################
## libringclient build ##
@@ -148,7 +148,7 @@ override_dh_auto_clean:
[ -f daemon/contrib/native/Makefile ] && \
make -C daemon/contrib/native distclean || true
rm -rfv daemon/contrib/native
- rm -rfv daemon/dring.1
+ rm -rfv daemon/jamid.1
#########################
## libringclient clean ##
diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec
index ca5438e13f1befe84b2b02b333439f7a2c1490c3..c7a6a1d5f9f0da176ed7812f464e5d144253dc42 100644
--- a/packaging/rules/rpm/jami-daemon.spec
+++ b/packaging/rules/rpm/jami-daemon.spec
@@ -90,13 +90,13 @@ cd %{_builddir}/ring-project/daemon && \
# Build the daemon.
make -C %{_builddir}/ring-project/daemon %{_smp_mflags} V=1
-pod2man %{_builddir}/ring-project/daemon/man/dring.pod \
- > %{_builddir}/ring-project/daemon/dring.1
+pod2man %{_builddir}/ring-project/daemon/man/jamid.pod \
+ > %{_builddir}/ring-project/daemon/jamid.1
%install
DESTDIR=%{buildroot} make -C daemon install
-cp %{_builddir}/ring-project/daemon/dring.1 \
- %{buildroot}/%{_mandir}/man1/dring.1
+cp %{_builddir}/ring-project/daemon/jamid.1 \
+ %{buildroot}/%{_mandir}/man1/jamid.1
rm -rfv %{buildroot}/%{_libdir}/*.a
rm -rfv %{buildroot}/%{_libdir}/*.la
@@ -108,7 +108,7 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
%{_datadir}/jami/ringtones
%{_datadir}/dbus-1/services/*
%{_datadir}/dbus-1/interfaces/*
-%doc %{_mandir}/man1/dring*
+%doc %{_mandir}/man1/jamid*
%package devel
Summary: Development files of the Jami daemon
@@ -117,7 +117,7 @@ Summary: Development files of the Jami daemon
This package contains the header files for using the Jami daemon as a library.
%files devel
-%{_includedir}/dring
+%{_includedir}/jami
%{_includedir}/jami_contact.h
%post