Replace occurrences of dring to jamid.

Automated via: $ git grep -l dring | xargs sed -i 's/dring/jamid/g'

Change-Id: I67715a37e0fae42a0e4d9ce42bd01becc1ac77f5

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()

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

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.

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+
 

packaging/rules/debian/jami-all.manpages

 client-gnome/doc/jami-gnome.1
-daemon/dring.1
+daemon/jamid.1

packaging/rules/debian/jami-daemon.manpages

-daemon/dring.1
+daemon/jamid.1

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 ##

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