From 8b3adc56aae8e91a113bea433c3b5dcd59a16eee Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 12 Nov 2013 13:21:47 +0000 Subject: [PATCH 3/3] Be parallel-installable with Idle 0.x --- .gitignore | 4 +-- ....telepathy.v1.ConnectionManager.idle.service.in | 2 +- src/Makefile.am | 10 +++---- src/telepathy-idle-1.8.in | 35 ++++++++++++++++++++++ src/telepathy-idle.8.in | 35 ---------------------- tests/twisted/tools/exec-with-log.sh.in | 2 +- 6 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 src/telepathy-idle-1.8.in delete mode 100644 src/telepathy-idle.8.in diff --git a/.gitignore b/.gitignore index adf29c4..1e7d9b3 100644 --- a/.gitignore +++ b/.gitignore @@ -50,8 +50,8 @@ data/im.telepathy.v1.ConnectionManager.idle.service extensions/_gen extensions/extensions.html -src/telepathy-idle -src/telepathy-idle.8 +src/telepathy-idle-1 +src/telepathy-idle-1.8 core cscope.out diff --git a/data/im.telepathy.v1.ConnectionManager.idle.service.in b/data/im.telepathy.v1.ConnectionManager.idle.service.in index 5c7a539..52377fe 100644 --- a/data/im.telepathy.v1.ConnectionManager.idle.service.in +++ b/data/im.telepathy.v1.ConnectionManager.idle.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=im.telepathy.v1.ConnectionManager.idle -Exec=@libexecdir@/telepathy-idle +Exec=@libexecdir@/telepathy-idle-1 diff --git a/src/Makefile.am b/src/Makefile.am index 7ed3126..c43c50c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # correctly clean the generated source files CLEANFILES = $(BUILT_SOURCES) $(man_MANS) -libexec_PROGRAMS=telepathy-idle +libexec_PROGRAMS = telepathy-idle-1 libidle_convenience_la_SOURCES = \ idle-connection.c \ @@ -52,10 +52,10 @@ nodist_libidle_convenience_la_SOURCES = \ libidle_convenience_la_LIBADD = \ $(top_builddir)/extensions/libidle-extensions.la -telepathy_idle_SOURCES = \ +telepathy_idle_1_SOURCES = \ idle.c -telepathy_idle_LDADD = \ +telepathy_idle_1_LDADD = \ libidle-convenience.la \ $(ALL_LIBS) @@ -79,9 +79,9 @@ ALL_LIBS = \ @GLIB_LIBS@ \ @TELEPATHY_LIBS@ -man_MANS = telepathy-idle.8 +man_MANS = telepathy-idle-1.8 -EXTRA_DIST = telepathy-idle.8.in +EXTRA_DIST = telepathy-idle-1.8.in %.8: %.8.in Makefile $(AM_V_GEN)sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@ diff --git a/src/telepathy-idle-1.8.in b/src/telepathy-idle-1.8.in new file mode 100644 index 0000000..ee889a1 --- /dev/null +++ b/src/telepathy-idle-1.8.in @@ -0,0 +1,35 @@ +.TH TELEPATHY-IDLE-1 "8" "October 2007" "Telepathy" "D-Bus services" +\" This man page was written by Simon McVittie for the Debian project, +\" but may be used by others. +\" Copyright © 2007 Collabora Ltd. +\" It may be distributed under the same terms as telepathy-idle itself. +.SH NAME +telepathy-idle-1 \- Telepathy connection manager for IRC +.SH SYNOPSIS +\fB@libexecdir@/telepathy\-idle\-1\fR +.SH DESCRIPTION +Idle implements the Telepathy D-Bus specification for Internet Relay Chat, +allowing Telepathy clients like +.BR empathy (1) +to connect to IRC servers. +.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 +\fBIDLE_LOGFILE\fR=\fIfilename\fR +If set, debug output will go to the given file rather than to stderr. +If \fB+\fR is prepended to the \fIfilename\fR (e.g. +\fBIDLE_LOGFILE=+idle.log\fR), debug output will be appended +to the file; otherwise, any existing file will be replaced. +.TP +.TP +\fBIDLE_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. +.SH SEE ALSO +.IR http://telepathy.freedesktop.org/ , +.BR empathy (1) diff --git a/src/telepathy-idle.8.in b/src/telepathy-idle.8.in deleted file mode 100644 index 54b0c4f..0000000 --- a/src/telepathy-idle.8.in +++ /dev/null @@ -1,35 +0,0 @@ -.TH TELEPATHY-IDLE "8" "October 2007" "Telepathy" "D-Bus services" -\" This man page was written by Simon McVittie for the Debian project, -\" but may be used by others. -\" Copyright © 2007 Collabora Ltd. -\" It may be distributed under the same terms as telepathy-idle itself. -.SH NAME -telepathy-idle \- Telepathy connection manager for IRC -.SH SYNOPSIS -\fB@libexecdir@/telepathy\-idle\fR -.SH DESCRIPTION -Idle implements the Telepathy D-Bus specification for Internet Relay Chat, -allowing Telepathy clients like -.BR empathy (1) -to connect to IRC servers. -.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 -\fBIDLE_LOGFILE\fR=\fIfilename\fR -If set, debug output will go to the given file rather than to stderr. -If \fB+\fR is prepended to the \fIfilename\fR (e.g. -\fBIDLE_LOGFILE=+idle.log\fR), debug output will be appended -to the file; otherwise, any existing file will be replaced. -.TP -.TP -\fBIDLE_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. -.SH SEE ALSO -.IR http://telepathy.freedesktop.org/ , -.BR empathy (1) diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in index 3538044..b3629c3 100644 --- a/tests/twisted/tools/exec-with-log.sh.in +++ b/tests/twisted/tools/exec-with-log.sh.in @@ -26,4 +26,4 @@ elif test -n "$IDLE_TEST_REFDBG"; then fi export G_DEBUG=fatal-warnings" ${G_DEBUG}" -exec @abs_top_builddir@/libtool --mode=execute $IDLE_WRAPPER @abs_top_builddir@/src/telepathy-idle +exec @abs_top_builddir@/libtool --mode=execute $IDLE_WRAPPER @abs_top_builddir@/src/telepathy-idle-1 -- 1.8.4.3