[next] telepathy-haze: Be parallel-installable with Haze 0.x

[Simon McVittie]

Module: telepathy-haze
Branch: next
Commit: e626238220f222993485281cb130bea9ee5eb364
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=e626238220f222993485281cb130bea9ee5eb364

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

Be parallel-installable with Haze 0.x

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

---

 .gitignore                                         |    4 ++--
 src/Makefile.am                                    |   10 +++++-----
 src/{telepathy-haze.8.in => telepathy-haze-1.8.in} |    6 +++---
 tests/twisted/tools/exec-with-log.sh               |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6fd34a..88e03c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,8 @@ m4/lt~obsolete.m4
 missing
 .deps
 .libs
-src/telepathy-haze
-src/telepathy-haze.8
+src/telepathy-haze-1
+src/telepathy-haze-1.8
 tags
 /tests/haze-testing.log
 /tests/twisted/tools/im.telepathy.v1.ConnectionManager.haze.service
diff --git a/src/Makefile.am b/src/Makefile.am
index 59bae17..a346066 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
-libexec_PROGRAMS = telepathy-haze
+libexec_PROGRAMS = telepathy-haze-1
 
-man_MANS = telepathy-haze.8
+man_MANS = telepathy-haze-1.8
 
 %.8: %.8.in Makefile
 	$(AM_V_GEN)sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
 
-EXTRA_DIST = telepathy-haze.8.in
+EXTRA_DIST = telepathy-haze-1.8.in
 CLEANFILES = $(man_MANS)
 
-telepathy_haze_SOURCES = main.c \
+telepathy_haze_1_SOURCES = main.c \
                          defines.h \
                          debug.c \
                          debug.h \
@@ -42,7 +42,7 @@ telepathy_haze_SOURCES = main.c \
                          util.h \
                          $(NULL)
 
-telepathy_haze_LDADD = $(top_builddir)/extensions/libhaze-extensions.la
+telepathy_haze_1_LDADD = $(top_builddir)/extensions/libhaze-extensions.la
 
 AM_CFLAGS = \
 	-I$(top_srcdir) \
diff --git a/src/telepathy-haze.8.in b/src/telepathy-haze-1.8.in
similarity index 87%
rename from src/telepathy-haze.8.in
rename to src/telepathy-haze-1.8.in
index 8641a11..de5982d 100644
--- a/src/telepathy-haze.8.in
+++ b/src/telepathy-haze-1.8.in
@@ -1,12 +1,12 @@
-.TH TELEPATHY-HAZE "8" "October 2007" "Telepathy" "D-Bus services"
+.TH TELEPATHY-HAZE-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-haze itself.
 .SH NAME
-telepathy-haze \- Telepathy connection manager using libpurple
+telepathy-haze-1 \- Telepathy connection manager using libpurple
 .SH SYNOPSIS
-\fB at libexecdir@/telepathy\-haze\fR
+\fB at libexecdir@/telepathy\-haze\-1\fR
 .SH DESCRIPTION
 Haze implements the Telepathy D-Bus specification using libpurple,
 allowing Telepathy clients like
diff --git a/tests/twisted/tools/exec-with-log.sh b/tests/twisted/tools/exec-with-log.sh
index e6e9379..b77e5c2 100755
--- a/tests/twisted/tools/exec-with-log.sh
+++ b/tests/twisted/tools/exec-with-log.sh
@@ -45,4 +45,4 @@ fi
 # not suitable for haze:
 #export G_DEBUG=fatal-warnings" ${G_DEBUG}"
 exec "${abs_top_builddir}/libtool" --mode=execute $HAZE_WRAPPER \
-    "${abs_top_builddir}/src/telepathy-haze"
+    "${abs_top_builddir}/src/telepathy-haze-1"