Attachment 89089 Details for Bug 49737 – [salut next 2/2] Be parallel-installable with Salut 0.x

[patch] [salut next 2/2] Be parallel-installable with Salut 0.x

0002-Be-parallel-installable-with-Salut-0.x.patch (text/plain), 14.35 KB, created by Simon McVittie on 2013-11-12 13:46:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-11-12 13:46:21 UTC

Size: 14.35 KB

patch

obsolete

>From 01b6b9e18235a1845b48fb68989c643d0775f781 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 12 Nov 2013 13:40:01 +0000
>Subject: [PATCH 2/2] Be parallel-installable with Salut 0.x
>
>... apart from /usr/share/doc, which packagers will probably move
>around according to distro policy anyway.
>
>Also use telepathy-glib-1 and telepathy-glib-1-dbus in .pc files,
>instead of telepathy-glib.
>---
> .gitignore                                | 10 ++++----
> configure.ac                              | 10 ++++----
> data/salut.service.in                     |  2 +-
> docs/Makefile.am                          |  2 +-
> docs/telepathy-salut-1.8.in               | 39 +++++++++++++++++++++++++++++++
> docs/telepathy-salut.8.in                 | 39 -------------------------------
> salut/Makefile.am                         |  4 ++--
> salut/telepathy-salut-1-uninstalled.pc.in | 17 ++++++++++++++
> salut/telepathy-salut-1.pc.in             | 17 ++++++++++++++
> salut/telepathy-salut-uninstalled.pc.in   | 17 --------------
> salut/telepathy-salut.pc.in               | 17 --------------
> src/Makefile.am                           | 14 +++++------
> tests/twisted/tools/exec-with-log.sh.in   |  2 +-
> 13 files changed, 95 insertions(+), 95 deletions(-)
> create mode 100644 docs/telepathy-salut-1.8.in
> delete mode 100644 docs/telepathy-salut.8.in
> create mode 100644 salut/telepathy-salut-1-uninstalled.pc.in
> create mode 100644 salut/telepathy-salut-1.pc.in
> delete mode 100644 salut/telepathy-salut-uninstalled.pc.in
> delete mode 100644 salut/telepathy-salut.pc.in
>
>diff --git a/.gitignore b/.gitignore
>index bfec94d..083c82d 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -88,7 +88,7 @@ data/salut.manager
> depcomp
> docs/xep.xsl
> docs/clique.html
>-docs/telepathy-salut.8
>+docs/telepathy-salut-1.8
> 
> docs/clique.html
> extensions/_gen
>@@ -107,7 +107,7 @@ ltmain.sh
> missing
> src/*-enumtypes.c
> src/*-enumtypes.h
>-src/telepathy-salut
>+src/telepathy-salut-1
> src/write-mgr-file
> stamp-h1
> telepathy-salut-*.tar.gz
>@@ -125,7 +125,7 @@ tests/twisted/tools/refdbg.log
> 
> tools/libglibcodegen.pyc
> 
>-src/telepathy-salut
>+src/telepathy-salut-1
> src/write-mgr-file
> 
> /telepathy-salut-*/
>@@ -148,5 +148,5 @@ lib/gibber/tests/check-gibber-r-multicast-packet
> lib/gibber/tests/check-gibber-r-multicast-sender
> lib/gibber/tests/check-gibber-unix-transport
> 
>-salut/telepathy-salut.pc
>-salut/telepathy-salut-uninstalled.pc
>+salut/telepathy-salut-1.pc
>+salut/telepathy-salut-1-uninstalled.pc
>diff --git a/configure.ac b/configure.ac
>index 035564c..facec9d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -275,11 +275,11 @@ AC_ARG_ENABLE(submodules,
> #
> # Private directory for Wocky and the salut-plugins library
> AS_IF([test "x$pluginexeclibdir" = x],
>-  [pluginexeclibdir='${libdir}/telepathy/salut-0/lib'])
>+  [pluginexeclibdir='${libdir}/telepathy/salut-1'])
> AC_ARG_VAR([pluginexeclibdir])
> # The actual plugins
> AS_IF([test "x$pluginexecdir" = x],
>-  [pluginexecdir='${libdir}/telepathy/salut-0/plugins'])
>+  [pluginexecdir='${libdir}/telepathy/salut-1/plugins'])
> AC_ARG_VAR([pluginexecdir])
> 
> dnl plugins
>@@ -298,7 +298,7 @@ AS_IF([test x$enable_plugins = xyes],
>                    [install headers for third-party plugins (experimental)]),
>     [
>       enable_plugin_api=$enableval
>-      wocky_install_headers_dir="${includedir}/telepathy-salut-0"
>+      wocky_install_headers_dir="${includedir}/telepathy-salut-1"
>     ],
>     [enable_plugin_api=no])
> ])
>@@ -368,8 +368,8 @@ AC_OUTPUT( Makefile                       \
>            tests/twisted/tools/Makefile   \
>            plugins/Makefile               \
>            salut/Makefile                 \
>-           salut/telepathy-salut-uninstalled.pc \
>-           salut/telepathy-salut.pc
>+           salut/telepathy-salut-1-uninstalled.pc \
>+           salut/telepathy-salut-1.pc
> )
> 
> if test false != "$TEST_PYTHON"; then
>diff --git a/data/salut.service.in b/data/salut.service.in
>index fe080b0..04be55e 100644
>--- a/data/salut.service.in
>+++ b/data/salut.service.in
>@@ -1,3 +1,3 @@
> [D-BUS Service]
> Name=im.telepathy.v1.ConnectionManager.salut
>-Exec=@libexecdir@/telepathy-salut
>+Exec=@libexecdir@/telepathy-salut-1
>diff --git a/docs/Makefile.am b/docs/Makefile.am
>index 87f549a..7259952 100644
>--- a/docs/Makefile.am
>+++ b/docs/Makefile.am
>@@ -1,6 +1,6 @@
> tools_dir = $(top_srcdir)/tools
> 
>-man_MANS = telepathy-salut.8
>+man_MANS = telepathy-salut-1.8
> html_DATA = clique.html
> 
> EXTRA_DIST = \
>diff --git a/docs/telepathy-salut-1.8.in b/docs/telepathy-salut-1.8.in
>new file mode 100644
>index 0000000..754db7e
>--- /dev/null
>+++ b/docs/telepathy-salut-1.8.in
>@@ -0,0 +1,39 @@
>+.TH TELEPATHY-SALUT-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-salut itself.
>+.SH NAME
>+telepathy-salut-1 \- Telepathy connection manager for link-local XMPP
>+.SH SYNOPSIS
>+\fB@libexecdir@/telepathy\-salut\-1\fR
>+.SH DESCRIPTION
>+Salut implements the Telepathy D-Bus specification for link-local XMPP
>+(XEP-0174, often called "Bonjour"), allowing Telepathy clients like
>+.BR empathy (1)
>+to communicate with other implementations of link-local XMPP, such as
>+iChat. It also extends the protocol to support multicast-based chat rooms
>+and collaboration.
>+.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
>+\fBSALUT_LOGFILE\fR=\fIfilename\fR
>+If set, debug output will go to the given file rather than to stderr.
>+.TP
>+\fBSALUT_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.
>+\fBGIBBER_DEBUG\fR=\fItype\fR
>+May be set to "all" for full debug output from the Gibber XMPP library used by
>+Salut, or various undocumented options (which may change from release to
>+release) to filter the output.
>+.SH SEE ALSO
>+.IR http://telepathy.freedesktop.org/ ,
>+.IR http://telepathy.freedesktop.org/wiki/CategorySalut ,
>+.IR http://www.xmpp.org/extensions/xep-0174.html ,
>+.BR empathy (1)
>diff --git a/docs/telepathy-salut.8.in b/docs/telepathy-salut.8.in
>deleted file mode 100644
>index 403d8bc..0000000
>--- a/docs/telepathy-salut.8.in
>+++ /dev/null
>@@ -1,39 +0,0 @@
>-.TH TELEPATHY-SALUT "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-salut itself.
>-.SH NAME
>-telepathy-salut \- Telepathy connection manager for link-local XMPP
>-.SH SYNOPSIS
>-\fB@libexecdir@/telepathy\-salut\fR
>-.SH DESCRIPTION
>-Salut implements the Telepathy D-Bus specification for link-local XMPP
>-(XEP-0174, often called "Bonjour"), allowing Telepathy clients like
>-.BR empathy (1)
>-to communicate with other implementations of link-local XMPP, such as
>-iChat. It also extends the protocol to support multicast-based chat rooms
>-and collaboration.
>-.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
>-\fBSALUT_LOGFILE\fR=\fIfilename\fR
>-If set, debug output will go to the given file rather than to stderr.
>-.TP
>-\fBSALUT_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.
>-\fBGIBBER_DEBUG\fR=\fItype\fR
>-May be set to "all" for full debug output from the Gibber XMPP library used by
>-Salut, or various undocumented options (which may change from release to
>-release) to filter the output.
>-.SH SEE ALSO
>-.IR http://telepathy.freedesktop.org/ ,
>-.IR http://telepathy.freedesktop.org/wiki/CategorySalut ,
>-.IR http://www.xmpp.org/extensions/xep-0174.html ,
>-.BR empathy (1)
>diff --git a/salut/Makefile.am b/salut/Makefile.am
>index f4b29c7..8223db7 100644
>--- a/salut/Makefile.am
>+++ b/salut/Makefile.am
>@@ -1,8 +1,8 @@
> if ENABLE_PLUGIN_API
> pkgconfigdir = $(libdir)/pkgconfig
>-pkgconfig_DATA = telepathy-salut.pc
>+pkgconfig_DATA = telepathy-salut-1.pc
> 
>-salutincludedir = $(includedir)/telepathy-salut-0/salut
>+salutincludedir = $(includedir)/telepathy-salut-1/salut
> salutinclude_HEADERS = \
>     plugin.h \
>     plugin-connection.h \
>diff --git a/salut/telepathy-salut-1-uninstalled.pc.in b/salut/telepathy-salut-1-uninstalled.pc.in
>new file mode 100644
>index 0000000..1d1658f
>--- /dev/null
>+++ b/salut/telepathy-salut-1-uninstalled.pc.in
>@@ -0,0 +1,17 @@
>+prefix=@prefix@
>+exec_prefix=@exec_prefix@
>+abs_top_srcdir=@abs_top_srcdir@
>+abs_top_builddir=@abs_top_builddir@
>+libdir=@libdir@
>+pluginexecdir=@pluginexecdir@
>+pluginexeclibdir=@pluginexeclibdir@
>+
>+salutpath=${abs_top_builddir}/src/telepathy-salut-1
>+
>+Name: Telepathy-Salut (uninstalled)
>+Description: Link-local XMPP backend for the Telepathy framework (uninstalled)
>+Version: @VERSION@
>+Requires: pkg-config >= 0.21
>+Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib-1, telepathy-glib-1-dbus
>+Libs: ${abs_top_builddir}/src/libsalut-plugins.la ${abs_top_builddir}/lib/ext/wocky/wocky/libwocky.la
>+Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky
>diff --git a/salut/telepathy-salut-1.pc.in b/salut/telepathy-salut-1.pc.in
>new file mode 100644
>index 0000000..3bb5308
>--- /dev/null
>+++ b/salut/telepathy-salut-1.pc.in
>@@ -0,0 +1,17 @@
>+prefix=@prefix@
>+exec_prefix=@exec_prefix@
>+libdir=@libdir@
>+includedir=@includedir@
>+libexecdir=@libexecdir@
>+
>+pluginexecdir=@pluginexecdir@
>+pluginexeclibdir=@pluginexeclibdir@
>+salutpath=${libexecdir}/telepathy-salut-1
>+
>+Name: Telepathy-Salut
>+Description: Link-local XMPP backend for the Telepathy framework
>+Version: @VERSION@
>+Requires: pkg-config >= 0.21
>+Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib-1, telepathy-glib-1-dbus
>+Libs: -L${pluginexeclibdir} -lsalut-plugins -lwocky
>+Cflags: -I${includedir}/telepathy-salut-1
>diff --git a/salut/telepathy-salut-uninstalled.pc.in b/salut/telepathy-salut-uninstalled.pc.in
>deleted file mode 100644
>index 03fadcd..0000000
>--- a/salut/telepathy-salut-uninstalled.pc.in
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-prefix=@prefix@
>-exec_prefix=@exec_prefix@
>-abs_top_srcdir=@abs_top_srcdir@
>-abs_top_builddir=@abs_top_builddir@
>-libdir=@libdir@
>-pluginexecdir=@pluginexecdir@
>-pluginexeclibdir=@pluginexeclibdir@
>-
>-salutpath=${abs_top_builddir}/src/telepathy-salut
>-
>-Name: Telepathy-Salut (uninstalled)
>-Description: Link-local XMPP backend for the Telepathy framework (uninstalled)
>-Version: @VERSION@
>-Requires: pkg-config >= 0.21
>-Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.20
>-Libs: ${abs_top_builddir}/src/libsalut-plugins.la ${abs_top_builddir}/lib/ext/wocky/wocky/libwocky.la
>-Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky
>diff --git a/salut/telepathy-salut.pc.in b/salut/telepathy-salut.pc.in
>deleted file mode 100644
>index a6d192a..0000000
>--- a/salut/telepathy-salut.pc.in
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-prefix=@prefix@
>-exec_prefix=@exec_prefix@
>-libdir=@libdir@
>-includedir=@includedir@
>-libexecdir=@libexecdir@
>-
>-pluginexecdir=@pluginexecdir@
>-pluginexeclibdir=@pluginexeclibdir@
>-salutpath=${libexecdir}/telepathy-salut
>-
>-Name: Telepathy-Salut
>-Description: Link-local XMPP backend for the Telepathy framework
>-Version: @VERSION@
>-Requires: pkg-config >= 0.21
>-Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.20
>-Libs: -L${pluginexeclibdir} -lsalut-plugins -lwocky
>-Cflags: -I${includedir}/telepathy-salut-0
>diff --git a/src/Makefile.am b/src/Makefile.am
>index e1d10e0..24d48c8 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -8,7 +8,7 @@ CLEANFILES = $(BUILT_SOURCES)
> dist-hook:
> 	$(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
> 
>-libexec_PROGRAMS=telepathy-salut
>+libexec_PROGRAMS = telepathy-salut-1
> noinst_PROGRAMS = write-mgr-file
> 
> CORE_SOURCES =                                          \
>@@ -176,14 +176,14 @@ write_mgr_file_LDADD = libsalut-convenience.la \
>                        $(top_builddir)/lib/gibber/libgibber.la \
>                        $(top_builddir)/extensions/libsalut-extensions.la \
>                        @TELEPATHY_GLIB_LIBS@
>-telepathy_salut_SOURCES = \
>+telepathy_salut_1_SOURCES = \
>     salut.c
> 
>-telepathy_salut_LDFLAGS = -export-dynamic
>+telepathy_salut_1_LDFLAGS = -export-dynamic
> 
> # Coding style checks
> check_c_sources = \
>-    $(telepathy_salut_SOURCES) \
>+    $(telepathy_salut_1_SOURCES) \
>     $(CORE_SOURCES) \
>     $(AVAHI_BACKEND_SOURCES) \
>     $(BONJOUR_BACKEND_SOURCES) \
>@@ -200,7 +200,7 @@ telepathy_salut_android_libs = libsalut-convenience.la \
>                                $(top_builddir)/extensions/libsalut-extensions.la \
>                                -ltelepathy-glib
> 
>-telepathy_salut_LDADD = libsalut-convenience.la \
>+telepathy_salut_1_LDADD = libsalut-convenience.la \
>                         $(top_builddir)/lib/gibber/libgibber.la \
>                         $(top_builddir)/extensions/libsalut-extensions.la \
>                         -ltelepathy-glib
>@@ -299,10 +299,10 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
> 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> 	 $(AM_CFLAGS) \
> 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>-	 -:SHARED telepathy-salut \
>+	 -:SHARED telepathy-salut-1 \
> 	 -:TAGS eng debug \
> 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
>-	 -:SOURCES $(telepathy_salut_SOURCES) \
>+	 -:SOURCES $(telepathy_salut_1_SOURCES) \
> 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> 	  $(AM_CFLAGS) \
> 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DBUILD_AS_ANDROID_SERVICE \
>diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in
>index 75829f7..7803f50 100644
>--- a/tests/twisted/tools/exec-with-log.sh.in
>+++ b/tests/twisted/tools/exec-with-log.sh.in
>@@ -31,4 +31,4 @@ if ! test -n "$SALUT_TEST_REAL_AVAHI"; then
> fi
> 
> export G_DEBUG=fatal-warnings" ${G_DEBUG}"
>-exec @abs_top_builddir@/libtool --mode=execute $SALUT_WRAPPER @abs_top_builddir@/src/telepathy-salut
>+exec @abs_top_builddir@/libtool --mode=execute $SALUT_WRAPPER @abs_top_builddir@/src/telepathy-salut-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.