[next] telepathy-gabble: Be parallel-installable with Gabble 0.x
Simon McVittie
smcv at kemper.freedesktop.org
Tue Jan 7 08:11:47 PST 2014
Module: telepathy-gabble
Branch: next
Commit: 17770462527c13882b045422aacf474ecf2bf310
URL: http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=17770462527c13882b045422aacf474ecf2bf310
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Nov 12 13:41:19 2013 +0000
Be parallel-installable with Gabble 0.x
... apart from /usr/share/doc, which packagers will probably
shuffle around according to distro policy anyway.
Also use telepathy-glib-1 and telepathy-glib-1-dbus in the .pc files.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49737
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
.gitignore | 4 ++--
configure.ac | 12 ++++++------
data/gabble.service.in | 2 +-
docs/Makefile.am | 2 +-
.../{telepathy-gabble.8.in => telepathy-gabble-1.8.in} | 6 +++---
gabble/Makefile.am | 2 +-
...lled.pc.in => telepathy-gabble-1-uninstalled.pc.in} | 4 ++--
...telepathy-gabble.pc.in => telepathy-gabble-1.pc.in} | 6 +++---
plugins/Makefile.am | 4 ++--
...le-xmpp-console => telepathy-gabble-1-xmpp-console} | 0
src/Makefile.am | 16 ++++++++--------
11 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6d23041..a6bc6e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@ core
/debian
/depcomp
/docs/*.html
-/docs/telepathy-gabble.8
+/docs/telepathy-gabble-1.8
/extensions/extensions.html
/gtk-doc.make
/install-sh
@@ -68,7 +68,7 @@ core
/src/gabble-enumtypes.c
/src/media-session-enumtypes.c
/src/media-session-enumtypes.h
-/src/telepathy-gabble
+/src/telepathy-gabble-1
/src/write-mgr-file
/stamp-h1
tags
diff --git a/configure.ac b/configure.ac
index ff476b1..74f9f2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,7 @@ if test x$installed_tests = xyes; then
fi
AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "x$installed_tests" = xyes])
-gabbletestsdir=${libdir}/telepathy-gabble-tests
+gabbletestsdir=${libdir}/telepathy-gabble-1-tests
AC_SUBST(gabbletestsdir)
AC_ARG_ENABLE([is-a-phone],
@@ -234,12 +234,12 @@ AC_SUBST(GLIB_GENMARSHAL)
#
# Private directory for Wocky and the gabble-plugins library
if test "x$pluginexeclibdir" = x; then
- pluginexeclibdir='${libdir}/telepathy/gabble-0/lib'
+ pluginexeclibdir='${libdir}/telepathy/gabble-1'
fi
AC_ARG_VAR([pluginexeclibdir])
# The actual plugins
if test "x$pluginexecdir" = x; then
- pluginexecdir='${libdir}/telepathy/gabble-0/plugins'
+ pluginexecdir='${libdir}/telepathy/gabble-1/plugins'
fi
AC_ARG_VAR([pluginexecdir])
@@ -257,7 +257,7 @@ if test x$enable_plugins = xyes; then
[install headers for third-party plugins (experimental)]),
[
enable_plugin_api=$enableval
- wocky_install_headers_dir="${includedir}/telepathy-gabble-0"
+ wocky_install_headers_dir="${includedir}/telepathy-gabble-1"
],
[enable_plugin_api=no])
fi
@@ -425,8 +425,8 @@ AC_OUTPUT( Makefile \
lib/gibber/Makefile \
plugins/Makefile \
gabble/Makefile \
- gabble/telepathy-gabble-uninstalled.pc \
- gabble/telepathy-gabble.pc
+ gabble/telepathy-gabble-1-uninstalled.pc \
+ gabble/telepathy-gabble-1.pc
)
if test false != "$TEST_PYTHON"; then
diff --git a/data/gabble.service.in b/data/gabble.service.in
index e3c0bf8..4063509 100644
--- a/data/gabble.service.in
+++ b/data/gabble.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=im.telepathy.v1.ConnectionManager.gabble
-Exec=@libexecdir@/telepathy-gabble
+Exec=@libexecdir@/telepathy-gabble-1
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 027e56e..e2df34c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -3,7 +3,7 @@ tools_dir = $(top_srcdir)/tools
# htmldir is not defined by autoconf < 2.59c
htmldir = $(if $(filter-out @%@, at htmldir@), at htmldir@,$(datadir)/doc/$(PACKAGE))
-man_MANS = telepathy-gabble.8
+man_MANS = telepathy-gabble-1.8
html_DATA = \
muc-bytestream.html \
si-multiple.html \
diff --git a/docs/telepathy-gabble.8.in b/docs/telepathy-gabble-1.8.in
similarity index 91%
rename from docs/telepathy-gabble.8.in
rename to docs/telepathy-gabble-1.8.in
index 2dc96a0..46e69f4 100644
--- a/docs/telepathy-gabble.8.in
+++ b/docs/telepathy-gabble-1.8.in
@@ -1,12 +1,12 @@
-.TH TELEPATHY-GABBLE "8" "October 2007" "Telepathy" "D-Bus services"
+.TH TELEPATHY-GABBLE-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-gabble itself.
.SH NAME
-telepathy-gabble \- Telepathy connection manager for XMPP (Jabber)
+telepathy-gabble-1 \- Telepathy connection manager for XMPP (Jabber)
.SH SYNOPSIS
-\fB at libexecdir@/telepathy\-gabble\fR
+\fB at libexecdir@/telepathy\-gabble\-1\fR
.SH DESCRIPTION
Gabble implements the Telepathy D-Bus specification for XMPP (Jabber),
allowing Telepathy clients like
diff --git a/gabble/Makefile.am b/gabble/Makefile.am
index 1e729a0..b9728a6 100644
--- a/gabble/Makefile.am
+++ b/gabble/Makefile.am
@@ -3,7 +3,7 @@ if ENABLE_PLUGIN_API
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = telepathy-gabble.pc
-gabbleincludedir = $(includedir)/telepathy-gabble-0/gabble
+gabbleincludedir = $(includedir)/telepathy-gabble-1/gabble
gabbleinclude_HEADERS = $(headers)
else
diff --git a/gabble/telepathy-gabble-uninstalled.pc.in b/gabble/telepathy-gabble-1-uninstalled.pc.in
similarity index 81%
rename from gabble/telepathy-gabble-uninstalled.pc.in
rename to gabble/telepathy-gabble-1-uninstalled.pc.in
index f5d027f..639d53d 100644
--- a/gabble/telepathy-gabble-uninstalled.pc.in
+++ b/gabble/telepathy-gabble-1-uninstalled.pc.in
@@ -6,12 +6,12 @@ libdir=@libdir@
pluginexecdir=@pluginexecdir@
pluginexeclibdir=@pluginexeclibdir@
-gabblepath=@abs_top_builddir@/src/telepathy-gabble # For plugins' tests
+gabblepath=@abs_top_builddir@/src/telepathy-gabble-1 # For plugins' tests
Name: Telepathy-Gabble
Description: XMPP backend for the Telepathy framework
Version: @VERSION@
Requires: pkg-config >= 0.21
-Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib >= 0.19.9
+Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib-1, telepathy-glib-1-dbus
Libs: ${abs_top_builddir}/src/libgabble-plugins.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky
diff --git a/gabble/telepathy-gabble.pc.in b/gabble/telepathy-gabble-1.pc.in
similarity index 74%
rename from gabble/telepathy-gabble.pc.in
rename to gabble/telepathy-gabble-1.pc.in
index 013ddbb..0cd1108 100644
--- a/gabble/telepathy-gabble.pc.in
+++ b/gabble/telepathy-gabble-1.pc.in
@@ -5,12 +5,12 @@ includedir=@includedir@
libexecdir=@libexecdir@
pluginexecdir=@pluginexecdir@
pluginexeclibdir=@pluginexeclibdir@
-gabblepath=${libexecdir}/telepathy-gabble # For plugins' tests
+gabblepath=${libexecdir}/telepathy-gabble-1 # For plugins' tests
Name: Telepathy-Gabble
Description: XMPP backend for the Telepathy framework
Version: @VERSION@
Requires: pkg-config >= 0.21
-Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib >= 0.19.9
+Requires.private: glib-2.0 >= 2.32, gobject-2.0, gio-2.0, telepathy-glib-1, telepathy-glib-1-dbus
Libs: -L${pluginexeclibdir} -lgabble-plugins -lwocky
-Cflags: -I${includedir}/telepathy-gabble-0
+Cflags: -I${includedir}/telepathy-gabble-1
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2b00079..536f49d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -30,14 +30,14 @@ if ENABLE_PLUGINS
pluginexec_LTLIBRARIES = $(installable_plugins)
dist_bin_SCRIPTS = \
- telepathy-gabble-xmpp-console
+ telepathy-gabble-1-xmpp-console
else
# we still compile the plugin (just to make sure it compiles!) but we don't
# install it
noinst_LTLIBRARIES += $(installable_plugins)
EXTRA_DIST = \
- telepathy-gabble-xmpp-console
+ telepathy-gabble-1-xmpp-console
endif
AM_LDFLAGS = -avoid-version -shared -no-undefined
diff --git a/plugins/telepathy-gabble-xmpp-console b/plugins/telepathy-gabble-1-xmpp-console
similarity index 100%
rename from plugins/telepathy-gabble-xmpp-console
rename to plugins/telepathy-gabble-1-xmpp-console
diff --git a/src/Makefile.am b/src/Makefile.am
index 28ff350..76bb226 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST =
-libexec_PROGRAMS=telepathy-gabble
+libexec_PROGRAMS = telepathy-gabble-1
noinst_PROGRAMS = write-mgr-file
libgabble_convenience_la_SOURCES = \
@@ -185,19 +185,19 @@ write_mgr_file_SOURCES = write-mgr-file.c
write_mgr_file_LDADD = libgabble-convenience.la
-telepathy_gabble_SOURCES = \
+telepathy_gabble_1_SOURCES = \
main.c
check_c_sources = \
- $(telepathy_gabble_SOURCES) \
+ $(telepathy_gabble_1_SOURCES) \
$(libgabble_convenience_la_SOURCES) \
$(write_mgr_file_SOURCES)
include $(top_srcdir)/tools/check-coding-style.mk
check-local: check-coding-style
-telepathy_gabble_LDADD = libgabble-convenience.la
+telepathy_gabble_1_LDADD = libgabble-convenience.la
-telepathy_gabble_LDFLAGS = -export-dynamic
+telepathy_gabble_1_LDFLAGS = -export-dynamic
noinst_LTLIBRARIES = libgabble-convenience.la
@@ -293,12 +293,12 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
-:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
-:LDFLAGS $(libgabble_plugins_la_LDFLAGS) \
$(libgabble_plugins_la_LIBADD) \
- -:SHARED telepathy-gabble -:TAGS eng debug \
+ -:SHARED telepathy-gabble-1 -:TAGS eng debug \
-:SOURCES $(libgabble_convenience_la_SOURCES) \
$(nodist_libgabble_convenience_la_SOURCES) main.c \
-:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CFLAGS) -DBUILD_AS_ANDROID_SERVICE \
- -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(telepathy_gabble_LDFLAGS) \
- -:LDFLAGS $(telepathy_gabble_LDADD) $(libgabble_convenience_la_LIBADD) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(telepathy_gabble_1_LDFLAGS) \
+ -:LDFLAGS $(telepathy_gabble_1_LDADD) $(libgabble_convenience_la_LIBADD) \
$(lib_LTLIBRARIES) \
> $@
More information about the telepathy-commits
mailing list