[Pkg-telepathy-commits] [telepathy-gabble-1] 04/11: Imported Upstream version 0.99.10
Simon McVittie
smcv at debian.org
Wed May 14 12:08:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-gabble-1.
commit 84ecb5b62f0cbda5a4cda44eb9802a89c44f6498
Author: Simon McVittie <smcv at debian.org>
Date: Thu Apr 3 18:30:06 2014 +0100
Imported Upstream version 0.99.10
---
ChangeLog | 18 +++++++++++++++++
NEWS | 17 ++++++++++++----
configure | 48 ++++++++++++++++++++++----------------------
configure.ac | 6 +++---
src/jingle-tp-util.c | 2 ++
tools/glib-ginterface-gen.py | 4 +++-
6 files changed, 63 insertions(+), 32 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1a5cd15..0a354a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit 1d145a4dba444ff19cb5fac6dd57b8865d47d290
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-04-03 17:48:21 +0100
+
+ 0.99.10
+
+commit d019a080bf063025bca9fcbd7052a72ef6e2aa3d
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-04-03 12:17:39 +0100
+
+ Adapt for move of tp_asv_*() to -dbus library
+
+commit 6bc9ba234e725f63de65724e19223eb082e9dfe3
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-04-03 11:26:36 +0100
+
+ Update codegen: include telepathy-glib-dbus.h in generated service code
+
commit a9f4bc06fe2a5a46081c7b27afc229ba9560ae0a
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: 2014-04-02 13:29:32 +0100
diff --git a/NEWS b/NEWS
index 89c34e7..74014b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
-telepathy-gabble 0.19.0 (UNRELEASED)
-====================================
+telepathy-gabble 0.99.10 (2014-04-03)
+=====================================
-The “very confused owl” release.
+The “you and whose army?” release.
Compile-time configuration:
@@ -10,12 +10,14 @@ Compile-time configuration:
Dependencies:
-• telepathy-glib ≥ 0.23.0 is required
+• telepathy-glib ≥ 0.99.10 is required
• Autoconf 2.60 is required
External changes:
+• Port to Telepathy 1
+
• Remove support for legacy StreamedMedia calls, and legacy Capabilities;
Gabble only implements Call1 calls and ContactCapabilities now
(fd.o #69194; Xavier, Simon, Guillaume)
@@ -24,6 +26,13 @@ External changes:
• Improve XMPP console (fd.o #66085, Will)
+• Remove OLPC-specific interfaces since they are not compatible with
+ Telepathy 1; please provide patches if you need them back, preferably
+ implementing them as a plugin or sidecar
+
+• Add GNOME-style installed-tests metadata if --enable-installed-tests
+ is used, and output in TAP format (fd.o #74626, Simon)
+
Fixes:
• Stop claiming to implement legacy Presence, which was deleted in 2011
diff --git a/configure b/configure
index 7c6f469..9dd8c40 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Telepathy Gabble 0.99.8.1.
+# Generated by GNU Autoconf 2.69 for Telepathy Gabble 0.99.10.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=gabble>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Telepathy Gabble'
PACKAGE_TARNAME='telepathy-gabble'
-PACKAGE_VERSION='0.99.8.1'
-PACKAGE_STRING='Telepathy Gabble 0.99.8.1'
+PACKAGE_VERSION='0.99.10'
+PACKAGE_STRING='Telepathy Gabble 0.99.10'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=gabble'
PACKAGE_URL=''
@@ -1408,7 +1408,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Telepathy Gabble 0.99.8.1 to adapt to many kinds of systems.
+\`configure' configures Telepathy Gabble 0.99.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1479,7 +1479,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Telepathy Gabble 0.99.8.1:";;
+ short | recursive ) echo "Configuration of Telepathy Gabble 0.99.10:";;
esac
cat <<\_ACEOF
@@ -1504,8 +1504,8 @@ Optional Features:
Enable generation of coverage data
--disable-Werror compile without -Werror (normally enabled in
development builds)
- --disable-coding-style-checks
- do not check coding style using grep
+ --enable-coding-style-checks
+ check coding style using grep
--enable-installed-tests
make tests installable
--enable-is-a-phone advertise that we are a phone, not a PC
@@ -1637,7 +1637,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Telepathy Gabble configure 0.99.8.1
+Telepathy Gabble configure 0.99.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2006,7 +2006,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Telepathy Gabble $as_me 0.99.8.1, which was
+It was created by Telepathy Gabble $as_me 0.99.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2881,7 +2881,7 @@ fi
# Define the identity of the package.
PACKAGE='telepathy-gabble'
- VERSION='0.99.8.1'
+ VERSION='0.99.10'
cat >>confdefs.h <<_ACEOF
@@ -12973,7 +12973,7 @@ fi
fi
- official_release=no
+ official_release=yes
if test "x$official_release" = xyes; then
OFFICIAL_RELEASE_TRUE=
@@ -13293,12 +13293,12 @@ $as_echo "$as_me: WARNING: Specified certificate authority file '$with_ca_certif
fi
fi
- # Gabble is version x.y.z.1 - enable coding style checks by default
+ # Gabble is version x.y.z - disable coding style checks by default
# Check whether --enable-coding-style-checks was given.
if test "${enable_coding_style_checks+set}" = set; then :
enableval=$enable_coding_style_checks; ENABLE_CODING_STYLE_CHECKS=$enableval
else
- ENABLE_CODING_STYLE_CHECKS=yes
+ ENABLE_CODING_STYLE_CHECKS=no
fi
@@ -13981,12 +13981,12 @@ if test -n "$TP_GLIB_CFLAGS"; then
pkg_cv_TP_GLIB_CFLAGS="$TP_GLIB_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TP_GLIB_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8" 2>/dev/null`
+ pkg_cv_TP_GLIB_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -13998,12 +13998,12 @@ if test -n "$TP_GLIB_LIBS"; then
pkg_cv_TP_GLIB_LIBS="$TP_GLIB_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TP_GLIB_LIBS=`$PKG_CONFIG --libs "telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8" 2>/dev/null`
+ pkg_cv_TP_GLIB_LIBS=`$PKG_CONFIG --libs "telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14024,14 +14024,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TP_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8" 2>&1`
+ TP_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10" 2>&1`
else
- TP_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8" 2>&1`
+ TP_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TP_GLIB_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8) were not met:
+ as_fn_error $? "Package requirements (telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10) were not met:
$TP_GLIB_PKG_ERRORS
@@ -15537,7 +15537,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Telepathy Gabble $as_me 0.99.8.1, which was
+This file was extended by Telepathy Gabble $as_me 0.99.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15603,7 +15603,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Telepathy Gabble config.status 0.99.8.1
+Telepathy Gabble config.status 0.99.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index b9a1e36..1fdcc6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,8 +9,8 @@ AC_PREREQ([2.60])
m4_define([gabble_major_version], [0])
m4_define([gabble_minor_version], [99])
-m4_define([gabble_micro_version], [8])
-m4_define([gabble_nano_version], [1])
+m4_define([gabble_micro_version], [10])
+m4_define([gabble_nano_version], [0])
# Some magic
m4_define([gabble_base_version],
@@ -285,7 +285,7 @@ AC_DEFINE(TP_SEAL_ENABLE, [], [Prevent to use sealed variables])
AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, [], [Disable single header include])
AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0], [Ignore post 1.0 deprecations])
AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0], [Prevent post 1.0 APIs])
-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib-1 >= 0.99.8, telepathy-glib-1-dbus >= 0.99.8])
+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10])
AC_SUBST(TP_GLIB_CFLAGS)
AC_SUBST(TP_GLIB_LIBS)
diff --git a/src/jingle-tp-util.c b/src/jingle-tp-util.c
index 212579f..2716b40 100644
--- a/src/jingle-tp-util.c
+++ b/src/jingle-tp-util.c
@@ -21,6 +21,8 @@
#include "jingle-tp-util.h"
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
WockyJingleMediaType
wocky_jingle_media_type_from_tp (TpMediaStreamType type)
{
diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
index d5a786f..184476d 100644
--- a/tools/glib-ginterface-gen.py
+++ b/tools/glib-ginterface-gen.py
@@ -741,12 +741,14 @@ class Generator(object):
self.b('')
if self.allow_single_include:
- self.b('#include <telepathy-glib/core-svc-interface.h>')
self.b('#include <telepathy-glib/dbus.h>')
self.b('#include <telepathy-glib/dbus-properties-mixin.h>')
+ self.b('#include <telepathy-glib/svc-interface.h>')
self.b('#include <telepathy-glib/util.h>')
+ self.b('#include <telepathy-glib/value-array.h>')
else:
self.b('#include <telepathy-glib/telepathy-glib.h>')
+ self.b('#include <telepathy-glib/telepathy-glib-dbus.h>')
self.b('')
for header in self.headers:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble-1.git
More information about the Pkg-telepathy-commits
mailing list