From b087c771b16d06fe212694e2bfc045eddba456af Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 12 Nov 2013 13:51:46 +0000 Subject: [PATCH] Be parallel-installable with Rakia 0 --- .gitignore | 4 +-- ...epathy.v1.ConnectionManager.sofiasip.service.in | 2 +- docs/Makefile.am | 4 +-- docs/telepathy-rakia-1.8.in | 42 ++++++++++++++++++++++ docs/telepathy-rakia.8.in | 42 ---------------------- rakia/Makefile.am | 2 +- src/Makefile.am | 6 ++-- tests/twisted/tools/exec-with-log.sh.in | 2 +- 8 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 docs/telepathy-rakia-1.8.in delete mode 100644 docs/telepathy-rakia.8.in 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[@],@libexecdir@,' < $< > $@ diff --git a/docs/telepathy-rakia-1.8.in b/docs/telepathy-rakia-1.8.in new file mode 100644 index 0000000..3965327 --- /dev/null +++ b/docs/telepathy-rakia-1.8.in @@ -0,0 +1,42 @@ +.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. +\" It may be distributed under the same terms as telepathy-rakia itself. +.SH NAME +telepathy-rakia-1 \- Telepathy connection manager for SIP +.SH SYNOPSIS +\fB@libexecdir@/telepathy\-rakia\-1\fR +.SH DESCRIPTION +\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. +.PP +It is a D-Bus service which runs on the session bus, and should usually be +started automatically by D-Bus activation. However, it might be useful to +start it manually for debugging. +.SH OPTIONS +There are no command-line options. +.SH ENVIRONMENT +.TP +\fBRAKIA_DEBUG\fR=\fItype\fR +May be set to "all" for full debug output, or various undocumented options +(which may change from release to release) to filter the output. +.TP +\fBRAKIA_LOGFILE\fR=\fIfilename\fR +May be set to the name of a file to overwrite with log messages. The filename +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\-1's usual automatic exit +when there have been no connections for a few seconds. +.TP +\fBTPORT_LOG\fR +May be set to any value to print all parsed SIP messages at the transport +layer (this functionality is provided by the underlying Sofia-SIP library, +which also offers various more specialized debugging options). +.SH SEE ALSO +.IR http://telepathy.freedesktop.org/ , +.BR empathy (1) diff --git a/docs/telepathy-rakia.8.in b/docs/telepathy-rakia.8.in deleted file mode 100644 index 7e2d353..0000000 --- a/docs/telepathy-rakia.8.in +++ /dev/null @@ -1,42 +0,0 @@ -.TH TELEPATHY-RAKIA "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. -\" It may be distributed under the same terms as telepathy-rakia itself. -.SH NAME -telepathy-rakia \- Telepathy connection manager for SIP -.SH SYNOPSIS -\fB@libexecdir@/telepathy\-rakia\fR -.SH DESCRIPTION -\fBtelepathy\-rakia\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. -.PP -It is a D-Bus service which runs on the session bus, and should usually be -started automatically by D-Bus activation. However, it might be useful to -start it manually for debugging. -.SH OPTIONS -There are no command-line options. -.SH ENVIRONMENT -.TP -\fBRAKIA_DEBUG\fR=\fItype\fR -May be set to "all" for full debug output, or various undocumented options -(which may change from release to release) to filter the output. -.TP -\fBRAKIA_LOGFILE\fR=\fIfilename\fR -May be set to the name of a file to overwrite with log messages. The filename -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 -when there have been no connections for a few seconds. -.TP -\fBTPORT_LOG\fR -May be set to any value to print all parsed SIP messages at the transport -layer (this functionality is provided by the underlying Sofia-SIP library, -which also offers various more specialized debugging options). -.SH SEE ALSO -.IR http://telepathy.freedesktop.org/ , -.BR empathy (1) 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 -- 1.8.4.3