diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-12 13:54:16 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 17:11:00 +0000 |
| commit | e626238220f222993485281cb130bea9ee5eb364 (patch) | |
| tree | 0173dfebfbb32486c313320c6812755da4d5b1a7 | |
| parent | 8266acb975d4999e847f4eb2d0659998b5b5a82e (diff) | |
| download | telepathy-haze-e626238220f222993485281cb130bea9ee5eb364.tar.gz | |
Be parallel-installable with Haze 0.x
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49737
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/telepathy-haze-1.8.in (renamed from src/telepathy-haze.8.in) | 6 | ||||
| -rwxr-xr-x | tests/twisted/tools/exec-with-log.sh | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -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[@],@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 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@libexecdir@/telepathy\-haze\fR +\fB@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" |