[next] telepathy-rakia: Be parallel-installable with Rakia 0

Tue Jan 7 09:05:15 PST 2014

Module: telepathy-rakia
Branch: next
Commit: 222908789271e2131fe50b1b5b28ada8c45fda4c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=222908789271e2131fe50b1b5b28ada8c45fda4c

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Nov 12 13:51:46 2013 +0000

Be parallel-installable with Rakia 0

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49737
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 .gitignore                                                 |    4 ++--
 data/im.telepathy.v1.ConnectionManager.sofiasip.service.in |    2 +-
 docs/Makefile.am                                           |    4 ++--
 docs/{telepathy-rakia.8.in => telepathy-rakia-1.8.in}      |   10 +++++-----
 rakia/Makefile.am                                          |    2 +-
 src/Makefile.am                                            |    6 +++---
 tests/twisted/tools/exec-with-log.sh.in                    |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d02e6f9..ee89d82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 # Build targets
 src/rakia.manager
-src/telepathy-rakia
+src/telepathy-rakia-1
 src/write-mgr-file
 extensions/_gen
 extensions/extensions.html
 data/im.telepathy.v1.ConnectionManager.*.service
-docs/telepathy-rakia.8
+docs/telepathy-rakia-1.8
 tests/twisted/tools/exec-with-log.sh
 tests/twisted/tools/im.telepathy.v1.ConnectionManager.*.service
 tests/twisted/tools/rakia-testing.log
diff --git a/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in b/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in
index 3f836f7..e544acd 100644
--- a/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in
+++ b/data/im.telepathy.v1.ConnectionManager.sofiasip.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=im.telepathy.v1.ConnectionManager.sofiasip
-Exec=@libexecdir@/telepathy-rakia
+Exec=@libexecdir@/telepathy-rakia-1
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a5fe109..6d8d938 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -79,9 +79,9 @@ GTKDOC_LIBS=
 EXTRA_DIST =
 
 # Man page
-man_MANS = telepathy-rakia.8
+man_MANS = telepathy-rakia-1.8
 CLEANFILES = $(man_MANS)
-EXTRA_DIST += telepathy-rakia.8.in
+EXTRA_DIST += telepathy-rakia-1.8.in
 
 %.8: %.8.in Makefile
 	sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
diff --git a/docs/telepathy-rakia.8.in b/docs/telepathy-rakia-1.8.in
similarity index 81%
rename from docs/telepathy-rakia.8.in
rename to docs/telepathy-rakia-1.8.in
index 7e2d353..3965327 100644
--- a/docs/telepathy-rakia.8.in
+++ b/docs/telepathy-rakia-1.8.in
@@ -1,14 +1,14 @@
-.TH TELEPATHY-RAKIA "8" "February 2010" "Telepathy" "D-Bus services"
+.TH TELEPATHY-RAKIA-1 "8" "February 2010" "Telepathy" "D-Bus services"
 \" This man page was written by Simon McVittie for the Debian project,
 \" but may be used by others.
 \" Copyright Â© 2007-2010 Collabora Ltd. <http://www.collabora.co.uk/>
 \" It may be distributed under the same terms as telepathy-rakia itself.
 .SH NAME
-telepathy-rakia \- Telepathy connection manager for SIP
+telepathy-rakia-1 \- Telepathy connection manager for SIP
 .SH SYNOPSIS
-\fB at libexecdir@/telepathy\-rakia\fR
+\fB at libexecdir@/telepathy\-rakia\-1\fR
 .SH DESCRIPTION
-\fBtelepathy\-rakia\fR implements the Telepathy D-Bus specification for
+\fBtelepathy\-rakia\-1\fR implements the Telepathy D-Bus specification for
 the Session Initiation Protocol, allowing Telepathy clients like
 .BR empathy (1)
 to connect to Voice over IP providers that implement SIP.
@@ -30,7 +30,7 @@ may be prefixed with \fB+\fR to append messages to an existing file instead
 of overwriting it.
 .TP
 \fBRAKIA_PERSIST\fR
-May be set to any value to avoid telepathy-rakia's usual automatic exit
+May be set to any value to avoid telepathy\-rakia\-1's usual automatic exit
 when there have been no connections for a few seconds.
 .TP
 \fBTPORT_LOG\fR
diff --git a/rakia/Makefile.am b/rakia/Makefile.am
index 645e6ae..c84c031 100644
--- a/rakia/Makefile.am
+++ b/rakia/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = @GLIB_CFLAGS@ @TELEPATHY_GLIB_CFLAGS@ @SOFIA_SIP_UA_CFLAGS@ \
 AM_CFLAGS = $(ERROR_CFLAGS) $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(ERROR_LDFLAGS)
 
-rakia_includedir = $(includedir)/telepathy-rakia-0.7/rakia
+rakia_includedir = $(includedir)/telepathy-rakia-1/rakia
 
 rakia_include_HEADERS = \
 	base-connection.h \
diff --git a/src/Makefile.am b/src/Makefile.am
index 38372b8..daf86b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ ALL_LIBS = $(DBUS_LIBS) $(GLIB_LIBS) $(SOFIA_SIP_UA_LIBS) \
 # ----------------------------------------------------------------------
 # Build targets
 
-libexec_PROGRAMS = telepathy-rakia
+libexec_PROGRAMS = telepathy-rakia-1
 manager_DATA = rakia.manager
 noinst_PROGRAMS = write-mgr-file
 noinst_LTLIBRARIES = librakia-convenience.la
@@ -84,10 +84,10 @@ librakia_convenience_la_LIBADD = \
     $(top_builddir)/rakia/librakia.la \
     $(top_builddir)/extensions/librakia-extensions.la
 
-telepathy_rakia_SOURCES = \
+telepathy_rakia_1_SOURCES = \
     telepathy-rakia.c 
 
-telepathy_rakia_LDADD = librakia-convenience.la $(ALL_LIBS)
+telepathy_rakia_1_LDADD = librakia-convenience.la $(ALL_LIBS)
 
 write_mgr_file_SOURCES = \
     write-mgr-file.c 
diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
index 6f37ef8..a0f34b9 100644
--- a/tests/twisted/tools/exec-with-log.sh.in
+++ b/tests/twisted/tools/exec-with-log.sh.in
@@ -18,4 +18,4 @@ if test -n "$RAKIA_TEST_VALGRIND"; then
 	RAKIA_WRAPPER="$RAKIA_WRAPPER --suppressions=@abs_top_srcdir@/tests/suppressions/rakia.supp"
 fi
 
-exec $RAKIA_WRAPPER @abs_top_builddir@/src/telepathy-rakia
+exec $RAKIA_WRAPPER @abs_top_builddir@/src/telepathy-rakia-1

