[Pkg-telepathy-commits] [telepathy-mission-control-5] 60/62: Merge tag 'upstream/5.15.1' into debian
Simon McVittie
smcv at alioth.debian.org
Thu Sep 19 14:18:08 UTC 2013
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-5.
commit a4dce2d466ff1dba9355527d08d598c9821874e6
Merge: 6065968 65790b6
Author: Simon McVittie <smcv at debian.org>
Date: Thu Sep 19 14:45:11 2013 +0100
Merge tag 'upstream/5.15.1' into debian
Upstream version 5.15.1
Conflicts:
ChangeLog
NEWS
build-aux/ltmain.sh
configure
configure.ac
doc/reference/mission-control-plugins/html/ch01.html
doc/reference/mission-control-plugins/html/ch02.html
doc/reference/mission-control-plugins/html/ch03.html
doc/reference/mission-control-plugins/html/ch04.html
doc/reference/mission-control-plugins/html/mission-control-plugins-McpAccountStorage.html
doc/reference/mission-control-plugins/html/mission-control-plugins-McpDispatchOperationPolicy.html
doc/reference/mission-control-plugins/html/mission-control-plugins-McpRequestPolicy.html
src/Makefile.in
src/mcd-account-manager-default.c
src/mcd-channel.c
ChangeLog | 622 +++++++++++++
INSTALL | 8 +-
Makefile.in | 352 +++----
NEWS | 59 +-
aclocal.m4 | 674 ++++++++------
build-aux/compile | 347 +++++++
config.guess => build-aux/config.guess | 184 ++--
config.sub => build-aux/config.sub | 97 +-
depcomp => build-aux/depcomp | 455 ++++++----
install-sh => build-aux/install-sh | 14 +-
ltmain.sh => build-aux/ltmain.sh | 4 +-
build-aux/missing | 215 +++++
build-aux/test-driver | 127 +++
config.h.in | 9 +-
configure | 957 ++++++++++----------
configure.ac | 75 +-
data/Makefile.in | 107 ++-
doc/Makefile.in | 271 +++---
doc/reference/Makefile.in | 270 +++---
doc/reference/mission-control-plugins/Makefile.in | 197 ++--
.../html/McpAccountManager.html | 476 +++++-----
.../html/McpDispatchOperation.html | 474 +++++-----
.../mission-control-plugins/html/McpRequest.html | 98 +-
.../html/annotation-glossary.html | 44 +-
.../html/api-index-full.html | 10 +-
.../mission-control-plugins/html/ch01.html | 12 +-
.../mission-control-plugins/html/ch02.html | 12 +-
.../mission-control-plugins/html/ch03.html | 12 +-
.../mission-control-plugins/html/ch04.html | 12 +-
.../mission-control-plugins/html/index.html | 8 +-
.../mission-control-plugins/html/index.sgml | 114 +--
.../mission-control-plugins-McpAccountStorage.html | 887 +++++++++---------
...control-plugins-McpDispatchOperationPolicy.html | 210 +++--
.../mission-control-plugins-McpRequestPolicy.html | 76 +-
...plugins-Plugin-loader-and-global-functions.html | 145 +--
.../html/mission-control-plugins.devhelp2 | 110 +--
.../mission-control-plugins/html/object-tree.html | 10 +-
.../mission-control-plugins-sections.txt | 135 ++-
gtk-doc.make | 70 +-
m4/Makefile.in | 107 ++-
m4/gtk-doc.m4 | 6 +-
missing | 331 -------
mission-control-plugins/Makefile.in | 209 +++--
mission-control-plugins/account-storage.c | 5 +-
mission-control-plugins/dispatch-operation.c | 16 +
mission-control-plugins/dispatch-operation.h | 4 +
plugins/Makefile.in | 214 +++--
server/Makefile.in | 223 +++--
src/Makefile.am | 15 +-
src/Makefile.in | 294 +++---
src/connectivity-monitor.c | 568 ++++++++----
src/connectivity-monitor.h | 4 +
src/kludge-transport.c | 268 ------
src/kludge-transport.h | 61 --
src/mcd-account-connection.c | 70 +-
src/mcd-account-manager-default.c | 440 +--------
src/mcd-account-manager-default.h | 1 -
src/mcd-account-manager.c | 26 +-
src/mcd-account-manager.h | 4 +
src/mcd-account-priv.h | 3 -
src/mcd-account.c | 255 +++---
src/mcd-account.h | 15 +-
src/mcd-channel.c | 53 +-
src/mcd-channel.h | 7 -
src/mcd-connection-plugin.h | 50 -
src/mcd-connection-priv.h | 5 -
src/mcd-connection-service-points.c | 45 +-
src/mcd-connection.c | 243 ++---
src/mcd-connection.h | 6 +-
src/mcd-debug.h | 2 +-
src/mcd-dispatcher.c | 2 +-
src/mcd-dispatcher.h | 15 -
src/mcd-manager.c | 36 +-
src/mcd-manager.h | 8 +-
src/mcd-master-priv.h | 6 -
src/mcd-master.c | 361 +-------
src/mcd-master.h | 23 +-
src/mcd-operation.c | 39 +-
src/mcd-storage.c | 6 +-
src/mcd-transport.c | 188 ----
src/mcd-transport.h | 83 --
tests/Makefile.am | 15 -
tests/Makefile.in | 813 +++++++++++------
tests/README | 12 +-
tests/account-store-default.c | 181 +---
tests/account-store-default.h | 2 -
tests/account-store.c | 69 +-
tests/keyring-command.c | 174 ----
tests/tease-the-minotaur.c | 4 +-
tests/twisted/Makefile.am | 159 +---
tests/twisted/Makefile.in | 939 ++++++++++++-------
tests/twisted/README | 12 +-
tests/twisted/account-manager/connectivity.py | 27 +-
.../account-manager/create-with-properties.py | 5 +-
tests/twisted/account-manager/hidden.py | 6 +
tests/twisted/account-manager/irc.py | 12 +-
tests/twisted/account-manager/server-drops-us.py | 128 +++
.../account-storage/default-keyring-storage.py | 97 +-
tests/twisted/constants.py | 5 +
.../dispatcher/create-delayed-by-mini-plugin.py | 181 ++--
tests/twisted/fake-network-monitor.c | 322 +++++++
tests/twisted/fakeconnectivity.py | 23 +-
tests/twisted/mc-debug-server.c | 26 -
tests/twisted/mcp-plugin.c | 5 +
tests/twisted/mctest.py | 9 +
tests/twisted/run-test.sh.in | 152 +++-
tests/twisted/tools/Makefile.in | 104 ++-
tests/twisted/tools/exec-with-log.sh.in | 24 +-
tests/twisted/tools/run-mc.sh.in | 22 +
tools/Makefile.in | 107 ++-
util/Makefile.in | 229 +++--
xml/Makefile.in | 109 ++-
112 files changed, 8865 insertions(+), 7384 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git
More information about the Pkg-telepathy-commits
mailing list