[Pkg-telepathy-commits] [telepathy-gabble] 31/33: Merge tag 'upstream/0.18.0' 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.

commit b105a69fd56c8b17c456629a16f57b351b07a009
Merge: 2e111dc 5e37647
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Aug 9 16:59:31 2013 +0100

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

 ChangeLog                                          |  300 +++
 INSTALL                                            |    8 +-
 Makefile.in                                        |  163 +-
 NEWS                                               |   37 +
 aclocal.m4                                         |  425 ++--
 config.h.in                                        |    2 +-
 configure                                          |  271 +--
 configure.ac                                       |   11 +-
 data/Makefile.in                                   |   17 +-
 depcomp                                            |   89 +-
 docs/Makefile.in                                   |   21 +-
 extensions/Makefile.in                             |   86 +-
 gabble/Makefile.in                                 |   31 +-
 gabble/telepathy-gabble-uninstalled.pc.in          |    2 +-
 gabble/telepathy-gabble.pc.in                      |    2 +-
 install-sh                                         |   14 +-
 lib/Makefile.in                                    |  109 +-
 lib/ext/Makefile.in                                |  111 +-
 lib/ext/wocky/INSTALL                              |    8 +-
 lib/ext/wocky/Makefile.in                          |  306 +--
 lib/ext/wocky/aclocal.m4                           |  572 ++---
 lib/ext/wocky/config.guess                         |  178 +-
 lib/ext/wocky/config.sub                           |   86 +-
 lib/ext/wocky/configure                            |  402 ++--
 lib/ext/wocky/depcomp                              |  455 ++--
 lib/ext/wocky/docs/Makefile.in                     |  264 ++-
 lib/ext/wocky/docs/reference/Makefile.in           |  106 +-
 .../docs/reference/html/WockyJingleContent.html    |  421 ++++
 .../docs/reference/html/WockyJingleFactory.html    |  179 ++
 .../docs/reference/html/WockyJingleMediaRtp.html   |  436 ++++
 .../docs/reference/html/WockyJingleSession.html    |  425 ++++
 .../reference/html/WockyJingleTransportGoogle.html |   79 +
 .../reference/html/WockyJingleTransportIceUdp.html |   67 +
 .../reference/html/WockyJingleTransportRawUdp.html |   67 +
 .../wocky/docs/reference/html/WockyNodeTree.html   |    2 +-
 .../wocky/docs/reference/html/api-index-full.html  |  388 ++--
 lib/ext/wocky/docs/reference/html/ch01.html        |   36 +-
 lib/ext/wocky/docs/reference/html/index.html       |   33 +
 lib/ext/wocky/docs/reference/html/index.sgml       |  279 +++
 lib/ext/wocky/docs/reference/html/object-tree.html |   22 +-
 .../docs/reference/html/wocky-WockyJingleInfo.html |  193 ++
 .../html/wocky-WockyJingleTransportIface.html      |  222 ++
 .../wocky/docs/reference/html/wocky-WockyNode.html |    2 +-
 .../docs/reference/html/wocky-WockyXmppWriter.html |    4 +-
 .../html/wocky-wocky-jingle-info-internal.html     |   72 +
 .../reference/html/wocky-wocky-jingle-types.html   |  913 ++++++++
 lib/ext/wocky/docs/reference/html/wocky.devhelp2   |  230 ++
 lib/ext/wocky/docs/reference/wocky-docs.sgml       |   22 +-
 lib/ext/wocky/examples/Makefile.am                 |    5 -
 lib/ext/wocky/examples/Makefile.in                 |  189 +-
 lib/ext/wocky/install-sh                           |   14 +-
 lib/ext/wocky/ltmain.sh                            |    4 +-
 lib/ext/wocky/m4/Makefile.in                       |  101 +-
 lib/ext/wocky/missing                              |  414 ++--
 lib/ext/wocky/tests/Makefile.am                    |   32 +-
 lib/ext/wocky/tests/Makefile.in                    |  321 ++-
 lib/ext/wocky/tests/wocky-connector-test.c         |   13 -
 lib/ext/wocky/tests/wocky-dummy-xmpp-server.c      |    4 -
 lib/ext/wocky/tests/wocky-porter-test.c            |    2 +-
 lib/ext/wocky/tests/wocky-test-helper.c            |   16 +
 lib/ext/wocky/tests/wocky-test-helper.h            |    2 +
 lib/ext/wocky/tests/wocky-test-sasl-auth-server.c  |    6 +-
 lib/ext/wocky/tests/wocky-xmpp-reader-test.c       |   43 +-
 lib/ext/wocky/tools/Makefile.in                    |  101 +-
 lib/ext/wocky/wocky/Makefile.in                    |  228 +-
 lib/gibber/Makefile.in                             |   65 +-
 ltmain.sh                                          |    4 +-
 m4/Makefile.in                                     |   17 +-
 missing                                            |   99 +-
 plugins/Makefile.in                                |   94 +-
 src/Makefile.in                                    |   77 +-
 src/connection.c                                   |    8 -
 src/gabble.c                                       |    7 -
 src/media-stream.h                                 |    2 +-
 src/tubes-channel.c                                | 2398 --------------------
 src/tubes-channel.h                                |   93 -
 tests/Makefile.in                                  |  137 +-
 tests/suppressions/Makefile.in                     |   17 +-
 tests/twisted/Makefile.am                          |   27 +-
 tests/twisted/Makefile.in                          |  193 +-
 tests/twisted/gabbletest.py                        |   23 +-
 tests/twisted/roster/groups.py                     |   39 +-
 tests/twisted/rostertest.py                        |   17 +-
 tests/twisted/run-test.sh.in                       |   78 +-
 tests/twisted/tubes/crash-on-list-channels.py      |   62 -
 tests/twisted/tubes/muc-presence.py                |   19 -
 tests/twisted/tubes/muctubeutil.py                 |   89 -
 tools/Makefile.in                                  |   17 +-
 88 files changed, 7361 insertions(+), 5884 deletions(-)

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