[Pkg-telepathy-commits] [telepathy-idle] 21/26: Merge tag 'upstream/0.2.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-idle.

commit 91f9d240910039886f62249ce7db86d36ac11719
Merge: 79c74e2 7901152
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 27 15:18:08 2014 +0000

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

 ChangeLog                                   | 179 +++++++
 INSTALL                                     |   8 +-
 Makefile.in                                 | 326 ++++++------
 NEWS                                        |  30 ++
 aclocal.m4                                  | 662 ++++++++++++++----------
 config.guess                                | 184 ++++---
 config.h.in                                 |  12 +-
 config.sub                                  |  97 ++--
 configure                                   | 343 +++++++------
 configure.ac                                |  16 +-
 data/Makefile.in                            | 104 ++--
 depcomp                                     | 455 ++++++++++-------
 extensions/Makefile.in                      | 202 +++++---
 install-sh                                  |  14 +-
 ltmain.sh                                   |  32 +-
 m4/Makefile.in                              | 101 ++--
 m4/libtool.m4                               |  33 +-
 missing                                     | 414 ++++++---------
 src/Makefile.in                             | 220 ++++----
 src/idle-connection-manager.c               |   1 -
 src/idle-connection-manager.h               |   2 +-
 src/idle-connection.c                       |  76 +--
 src/idle-connection.h                       |   4 +-
 src/idle-contact-info.c                     |   5 -
 src/idle-contact-info.h                     |   2 +-
 src/idle-debug.c                            |   3 +-
 src/idle-handles.c                          |   3 +-
 src/idle-handles.h                          |   2 +-
 src/idle-im-channel.c                       |   2 -
 src/idle-im-channel.h                       |   4 +-
 src/idle-im-manager.c                       |   8 +-
 src/idle-muc-channel.c                      |  31 +-
 src/idle-muc-channel.h                      |   7 +-
 src/idle-muc-manager.c                      |  11 +-
 src/idle-parser.h                           |   2 +-
 src/idle-roomlist-channel.c                 |   1 +
 src/idle-roomlist-manager.c                 |   5 +-
 src/idle-server-connection.c                |  20 +-
 src/idle-text.c                             |   2 -
 src/idle-text.h                             |   2 +-
 src/idle.c                                  |   4 +-
 src/protocol.c                              |  15 +-
 src/protocol.h                              |   2 +-
 src/room-config.h                           |   2 +-
 test-driver                                 | 127 +++++
 tests/Makefile.in                           | 758 ++++++++++++++++++++--------
 tests/test-ctcp-tokenize.c                  |   2 +-
 tests/test-text-encode-and-split.c          |   2 +-
 tests/twisted/Makefile.am                   |  66 ++-
 tests/twisted/Makefile.in                   | 440 +++++++---------
 tests/twisted/channels/room-list-channel.py |   2 +-
 tests/twisted/run-test.sh.in                |  74 +++
 tests/twisted/tools/Makefile.in             | 101 ++--
 tools/Makefile.in                           | 101 ++--
 tools/glib-ginterface-gen.py                |   2 +-
 55 files changed, 3222 insertions(+), 2101 deletions(-)

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