[Pkg-telepathy-commits] [telepathy-gabble-1] 09/11: Merge tag 'upstream/0.99.11' into debian

[Simon McVittie]

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 56d04f320a79908e7c333c8c717baa9ae113e477
Merge: 7a3ac15 faed11e
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 14 11:00:01 2014 +0100

    Merge tag 'upstream/0.99.11' into debian
    
    Upstream version 0.99.11

 ChangeLog                                  | 205 +++++++++++++++++++++++++++++
 NEWS                                       |  15 +++
 aclocal.m4                                 |  55 ++++++++
 build-aux/config.guess                     | 192 ++++-----------------------
 build-aux/config.sub                       |  23 ++--
 config.h.in                                |   4 +-
 configure                                  |  78 +++++------
 configure.ac                               |  12 +-
 extensions/all.xml                         |   2 +-
 lib/ext/wocky/aclocal.m4                   |  55 ++++++++
 lib/ext/wocky/config.guess                 | 192 ++++-----------------------
 lib/ext/wocky/config.sub                   |  23 ++--
 lib/ext/wocky/configure                    |  12 +-
 lib/ext/wocky/ltmain.sh                    |   4 +-
 lib/ext/wocky/m4/libtool.m4                |  12 +-
 plugins/console/channel-manager.c          |   4 +-
 plugins/test.c                             |   6 +-
 src/addressing-util.c                      |  15 ++-
 src/addressing-util.h                      |   2 +-
 src/auth-manager.c                         |  12 +-
 src/bytestream-factory.c                   |   6 +-
 src/bytestream-ibb.c                       |   8 +-
 src/bytestream-iface.c                     |   4 +-
 src/bytestream-muc.c                       |  10 +-
 src/bytestream-multiple.c                  |   8 +-
 src/bytestream-socks5.c                    |   8 +-
 src/conn-addressing.c                      |  40 +++---
 src/conn-addressing.h                      |   2 +-
 src/conn-aliasing.c                        |  12 +-
 src/conn-aliasing.h                        |   2 +-
 src/conn-avatars.c                         |  15 +--
 src/conn-avatars.h                         |   2 +-
 src/conn-client-types.c                    |  12 +-
 src/conn-client-types.h                    |   2 +-
 src/conn-contact-info.c                    |  16 ++-
 src/conn-contact-info.h                    |   2 +-
 src/conn-location.c                        |  11 +-
 src/conn-location.h                        |   2 +-
 src/conn-presence.c                        | 131 +++++-------------
 src/conn-presence.h                        |   2 +-
 src/connection.c                           | 167 +++++++++++------------
 src/connection.h                           |   3 -
 src/ft-manager.c                           |  15 ++-
 src/gabble.c                               |   1 -
 src/im-factory.c                           |  34 +++--
 src/media-factory.c                        |  20 +--
 src/muc-channel.c                          |  68 +++++-----
 src/muc-channel.h                          |   2 +-
 src/muc-factory.c                          |  75 ++++++-----
 src/presence-cache.c                       |   3 +-
 src/private-tubes-factory.c                |  29 ++--
 src/protocol.c                             |  16 ---
 src/roomlist-manager.c                     |  17 ++-
 src/roster.c                               |  10 +-
 src/search-manager.c                       |  42 +++---
 src/server-sasl-channel.c                  |  34 ++---
 src/server-sasl-channel.h                  |   2 -
 src/server-tls-manager.c                   |   8 +-
 src/tls-certificate.c                      |  19 +--
 src/tls-certificate.h                      |   2 -
 src/tube-dbus.c                            |   6 +-
 src/tube-dbus.h                            |   2 +-
 src/tube-stream.c                          |  10 +-
 src/tube-stream.h                          |   2 +-
 src/write-mgr-file.c                       |  15 +--
 tests/test-gabble-idle-weak.c              |   1 -
 tests/test-handles.c                       |   6 +-
 tests/test-parse-message.c                 |   1 -
 tests/test-presence.c                      |   1 -
 tests/tp-error-from-wocky.c                |   2 -
 tests/twisted/constants.py                 |   3 +
 tests/twisted/mail-notification.py         |  55 +++++---
 tests/twisted/roster/test-google-roster.py |   6 +-
 tests/twisted/search/search_helper.py      |   1 +
 tests/twisted/test-location.py             |   9 +-
 75 files changed, 951 insertions(+), 954 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble-1.git