[Pkg-telepathy-commits] [telepathy-mission-control-6] 74/90: Imported Upstream version 5.99.10
Simon McVittie
smcv at debian.org
Wed May 14 12:09:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.
commit 0b4f890bc9999822d88a11562a2ee0d830f051e1
Author: Simon McVittie <smcv at debian.org>
Date: Thu Apr 3 18:33:49 2014 +0100
Imported Upstream version 5.99.10
---
ChangeLog | 6 ++++++
NEWS | 30 +++++++++++++++---------------
configure | 38 +++++++++++++++++++-------------------
configure.ac | 4 ++--
4 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ff40966..fec940f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+commit b43b258ea28041360122ffb6e85b87aad5c9665a
+Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: 2014-04-03 18:23:58 +0100
+
+ 5.99.10
+
commit 9ea179a97d957e41be9eccc03236e254220c3ad2
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: 2014-04-02 12:25:40 +0100
diff --git a/NEWS b/NEWS
index fde0eb7..6e7bc9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,16 @@
-telepathy-mission-control 5.99.8 (2014-03-19)
-=============================================
+telepathy-mission-control 5.99.10 (2014-04-03)
+==============================================
-• Telepathy 1.0 branch; changes below are a summary of changes since 5.16,
- and might not be complete.
+Incompatible changes:
-Running this version of Mission Control for the first time will automatically
-migrate some account data to a new format. If you subsequently downgrade
-to an older version, it will no longer understand all account data.
-Taking a backup copy of ~/.local/share/telepathy/mission-control
-before you upgrade is recommended.
+• MC 6 implements the Telepathy 1 D-Bus API, and is parallel-installable
+ with Telepathy 0 (MC 5).
-Incompatible changes:
+• Accounts are now stored in XDG_DATA_DIRS/telepathy-1/mission-control/,
+ in separate per-account files.
• The mission-control-plugins library has broken API/ABI; deprecated functions
- and the "D-Bus ACL" plugin API have been removed. For plugins not using
- this functionality (e.g. Empathy's GNOME Online Accounts integration),
- a simple recompile should be sufficient.
+ and the "D-Bus ACL" plugin API have been removed.
• mcp_dispatch_operation_ref_connection(),
mcp_dispatch_operation_find_channel_by_type() and
@@ -57,7 +52,7 @@ Incompatible changes:
Dependencies:
• GLib ≥ 2.36 (including GObject, GModule and GIO) is now required
-• telepathy-glib ≥ 0.23.1 is now required
+• telepathy-glib ≥ 0.99.10 is now required
Enhancements:
@@ -69,7 +64,12 @@ Enhancements:
• Re-save parameters with their types when edited, or when we discover
what type the connection manager expects (fd.o #71093, Simon)
-• Use telepathy-glib 0.23 for CD.I.Messages (fd.o #37380, Simon)
+• Use telepathy-glib for CD.I.Messages (fd.o #37380, Simon)
+
+• Improve installable tests and provide GNOME-style metadata
+ (fd.o #74626, Simon)
+
+• Automatically import Telepathy 0 accounts on first run (fd.o #70991, Simon)
Fixes:
diff --git a/configure b/configure
index cd4c704..811819c 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-mission-control 5.99.8+.
+# Generated by GNU Autoconf 2.69 for telepathy-mission-control 5.99.10.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='telepathy-mission-control'
PACKAGE_TARNAME='telepathy-mission-control'
-PACKAGE_VERSION='5.99.8+'
-PACKAGE_STRING='telepathy-mission-control 5.99.8+'
+PACKAGE_VERSION='5.99.10'
+PACKAGE_STRING='telepathy-mission-control 5.99.10'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1416,7 +1416,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-mission-control 5.99.8+ to adapt to many kinds of systems.
+\`configure' configures telepathy-mission-control 5.99.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1487,7 +1487,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of telepathy-mission-control 5.99.8+:";;
+ short | recursive ) echo "Configuration of telepathy-mission-control 5.99.10:";;
esac
cat <<\_ACEOF
@@ -1645,7 +1645,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-telepathy-mission-control configure 5.99.8+
+telepathy-mission-control configure 5.99.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2131,7 +2131,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-mission-control $as_me 5.99.8+, which was
+It was created by telepathy-mission-control $as_me 5.99.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2997,7 +2997,7 @@ fi
# Define the identity of the package.
PACKAGE='telepathy-mission-control'
- VERSION='5.99.8+'
+ VERSION='5.99.10'
cat >>confdefs.h <<_ACEOF
@@ -16557,12 +16557,12 @@ if test -n "$TELEPATHY_CFLAGS"; then
pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_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.7, telepathy-glib-1-dbus >= 0.99.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7") 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_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7" 2>/dev/null`
+ pkg_cv_TELEPATHY_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
@@ -16574,12 +16574,12 @@ if test -n "$TELEPATHY_LIBS"; then
pkg_cv_TELEPATHY_LIBS="$TELEPATHY_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.7, telepathy-glib-1-dbus >= 0.99.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7") 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_TELEPATHY_LIBS=`$PKG_CONFIG --libs "telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7" 2>/dev/null`
+ pkg_cv_TELEPATHY_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
@@ -16600,14 +16600,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7" 2>&1`
+ TELEPATHY_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
- TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7" 2>&1`
+ TELEPATHY_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 "$TELEPATHY_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7) were not met:
+ as_fn_error $? "Package requirements (telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10) were not met:
$TELEPATHY_PKG_ERRORS
@@ -18181,7 +18181,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-mission-control $as_me 5.99.8+, which was
+This file was extended by telepathy-mission-control $as_me 5.99.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18247,7 +18247,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-mission-control config.status 5.99.8+
+telepathy-mission-control config.status 5.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 4f6a0ba..05ed389 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Set the version number to e.g. 5.x.y immediately before a release.
dnl Set the version number to e.g. 5.x.y+ immediately after (this will
dnl enable -Werror).
-AC_INIT([telepathy-mission-control], [5.99.8+])
+AC_INIT([telepathy-mission-control], [5.99.10])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
@@ -157,7 +157,7 @@ AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES([TELEPATHY],
- [telepathy-glib-1 >= 0.99.7, telepathy-glib-1-dbus >= 0.99.7])
+ [telepathy-glib-1 >= 0.99.10, telepathy-glib-1-dbus >= 0.99.10])
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],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git
More information about the Pkg-telepathy-commits
mailing list