Attachment 89092 Details for Bug 49737 – [haze next] Be parallel-installable with Haze 0.x

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

0001-Be-parallel-installable-with-Haze-0.x.patch (text/plain), 5.48 KB, created by Simon McVittie on 2013-11-12 13:55:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-12 13:55:29 UTC

Size: 5.48 KB

patch

obsolete

>From 343dbd1a8afb62853c760564ecfd7bfb5e0f7c00 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 12 Nov 2013 13:54:16 +0000
>Subject: [PATCH] Be parallel-installable with Haze 0.x
>
>---
> .gitignore                           |  4 ++--
> src/Makefile.am                      | 10 +++++-----
> src/telepathy-haze-1.8.in            | 38 ++++++++++++++++++++++++++++++++++++
> src/telepathy-haze.8.in              | 38 ------------------------------------
> tests/twisted/tools/exec-with-log.sh |  2 +-
> 5 files changed, 46 insertions(+), 46 deletions(-)
> create mode 100644 src/telepathy-haze-1.8.in
> delete mode 100644 src/telepathy-haze.8.in
>
>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[@],@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-1.8.in b/src/telepathy-haze-1.8.in
>new file mode 100644
>index 0000000..de5982d
>--- /dev/null
>+++ b/src/telepathy-haze-1.8.in
>@@ -0,0 +1,38 @@
>+.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-1 \- Telepathy connection manager using libpurple
>+.SH SYNOPSIS
>+\fB@libexecdir@/telepathy\-haze\-1\fR
>+.SH DESCRIPTION
>+Haze implements the Telepathy D-Bus specification using libpurple,
>+allowing Telepathy clients like
>+.BR empathy (1)
>+to connect to any protocol supported by
>+.BR pidgin (1).
>+.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
>+\fBHAZE_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
>+\fBHAZE_PERSIST\fR=1
>+If set, Haze will not automatically close itself after five seconds without
>+any connections.
>+.TP
>+\fBHAZE_LOGFILE\fR=\fIfilename\fR
>+If set, all debugging output will be written to \fIfilename\fR rather than
>+to the terminal.
>+.SH SEE ALSO
>+.IR http://telepathy.freedesktop.org/ ,
>+.BR empathy (1),
>+.BR pidgin (1)
>diff --git a/src/telepathy-haze.8.in b/src/telepathy-haze.8.in
>deleted file mode 100644
>index 8641a11..0000000
>--- a/src/telepathy-haze.8.in
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-.TH TELEPATHY-HAZE "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
>-.SH SYNOPSIS
>-\fB@libexecdir@/telepathy\-haze\fR
>-.SH DESCRIPTION
>-Haze implements the Telepathy D-Bus specification using libpurple,
>-allowing Telepathy clients like
>-.BR empathy (1)
>-to connect to any protocol supported by
>-.BR pidgin (1).
>-.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
>-\fBHAZE_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
>-\fBHAZE_PERSIST\fR=1
>-If set, Haze will not automatically close itself after five seconds without
>-any connections.
>-.TP
>-\fBHAZE_LOGFILE\fR=\fIfilename\fR
>-If set, all debugging output will be written to \fIfilename\fR rather than
>-to the terminal.
>-.SH SEE ALSO
>-.IR http://telepathy.freedesktop.org/ ,
>-.BR empathy (1),
>-.BR pidgin (1)
>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"
>-- 
>1.8.4.3
>

Actions: View | Splinter Review

Attachments on bug 49737: 88604 | 89087 | 89088 | 89089 | 89090 | 89091 | 89092 | 89093 | 89094 | 89095 | 91608

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.