Module: telepathy-idle
Branch: next
Commit: f58cccac0ae65ce87a7fc5fc371669c7c9e7687e
URL: http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=f58cccac0ae65ce87a7fc5fc371669c7c9e7687e
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Nov 12 13:21:47 2013 +0000
Be parallel-installable with Idle 0.x
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.idle.service.in | 2 +-
src/Makefile.am | 10 +++++-----
src/{telepathy-idle.8.in => telepathy-idle-1.8.in} | 6 +++---
tests/twisted/tools/exec-with-log.sh.in | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
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[@], at libexecdir@,' < $< > $@
diff --git a/src/telepathy-idle.8.in b/src/telepathy-idle-1.8.in
similarity index 87%
rename from src/telepathy-idle.8.in
rename to src/telepathy-idle-1.8.in
index 54b0c4f..ee889a1 100644
--- a/src/telepathy-idle.8.in
+++ b/src/telepathy-idle-1.8.in
@@ -1,12 +1,12 @@
-.TH TELEPATHY-IDLE "8" "October 2007" "Telepathy" "D-Bus services"
+.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. <http://www.collabora.co.uk/>
\" It may be distributed under the same terms as telepathy-idle itself.
.SH NAME
-telepathy-idle \- Telepathy connection manager for IRC
+telepathy-idle-1 \- Telepathy connection manager for IRC
.SH SYNOPSIS
-\fB at libexecdir@/telepathy\-idle\fR
+\fB at libexecdir@/telepathy\-idle\-1\fR
.SH DESCRIPTION
Idle implements the Telepathy D-Bus specification for Internet Relay Chat,
allowing Telepathy clients like
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