[Pkg-telepathy-commits] [telepathy-mission-control-6] 279/280: Merge tag 'upstream/5.99.8+54+gff2328c' into debian
Simon McVittie
smcv at debian.org
Thu Mar 27 20:07:35 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 b730de3589a329df898195d5dec3ef685569860f
Merge: 5a8189a bd22d0c
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 18:41:16 2014 +0000
Merge tag 'upstream/5.99.8+54+gff2328c' into debian
Upstream version 5.99.8+54+gff2328c
Conflicts:
ChangeLog
NEWS
configure
configure.ac
doc/reference/mission-control-plugins/html/McpAccountManager.html
doc/reference/mission-control-plugins/html/McpDispatchOperation.html
doc/reference/mission-control-plugins/html/annotation-glossary.html
doc/reference/mission-control-plugins/html/index.sgml
doc/reference/mission-control-plugins/html/mission-control-plugins.devhelp2
doc/reference/mission-control-plugins/mission-control-plugins-sections.txt
xml/Makefile.in
ChangeLog | 3330 +++++++++++++++++++-
INSTALL | 4 +-
Makefile.am | 5 +-
Makefile.in | 36 +-
NEWS | 85 +
README | 6 +-
aclocal.m4 | 37 +-
build-aux/ltmain.sh | 4 +-
build-aux/missing | 4 +-
build-aux/test-driver | 20 +-
compile | 347 ++
config.guess | 1558 +++++++++
config.h.in | 36 +-
config.sub | 1791 +++++++++++
configure | 746 +----
configure.ac | 172 +-
data/Makefile.am | 2 +-
data/Makefile.in | 10 +-
...athy.v1.MissionControl.FromEmpathy.gschema.xml} | 2 +-
depcomp | 708 +++++
doc/Makefile.am | 13 -
doc/Makefile.in | 51 +-
doc/reference/Makefile.in | 8 +-
doc/reference/mission-control-plugins/Makefile.am | 16 +-
doc/reference/mission-control-plugins/Makefile.in | 69 +-
.../html/McpAccountManager.html | 672 ++--
.../html/McpDispatchOperation.html | 1022 +++---
.../html/McpDispatchOperationPolicy.html | 492 +++
.../mission-control-plugins/html/McpRequest.html | 263 +-
.../html/McpRequestPolicy.html | 247 ++
.../html/annotation-glossary.html | 60 +-
.../html/api-index-full.html | 311 +-
.../mission-control-plugins/html/ch01.html | 18 +-
.../mission-control-plugins/html/ch02.html | 18 +-
.../mission-control-plugins/html/ch03.html | 22 +-
.../mission-control-plugins/html/ch04.html | 22 +-
.../mission-control-plugins/html/home.png | Bin 654 -> 256 bytes
.../mission-control-plugins/html/index.html | 10 +-
.../mission-control-plugins/html/index.sgml | 146 +-
.../html/left-insensitive.png | Bin 0 -> 395 bytes
.../mission-control-plugins/html/left.png | Bin 459 -> 262 bytes
.../mission-control-plugins-McpAccountStorage.html | 2382 ++++++++------
...control-plugins-McpDispatchOperationPolicy.html | 472 ---
.../mission-control-plugins-McpRequestPolicy.html | 242 --
...plugins-Plugin-loader-and-global-functions.html | 335 +-
.../html/mission-control-plugins.devhelp2 | 163 +-
.../mission-control-plugins/html/object-tree.html | 26 +-
.../html/right-insensitive.png | Bin 0 -> 373 bytes
.../mission-control-plugins/html/right.png | Bin 472 -> 261 bytes
.../mission-control-plugins/html/style.css | 247 +-
.../html/up-insensitive.png | Bin 0 -> 374 bytes
doc/reference/mission-control-plugins/html/up.png | Bin 406 -> 260 bytes
.../mission-control-plugins-sections.txt | 85 +-
.../mission-control-plugins.types | 1 -
gtk-doc.make | 33 +-
install-sh | 527 ++++
build-aux/ltmain.sh => ltmain.sh | 0
m4/Makefile.in | 8 +-
m4/gtk-doc.m4 | 47 +-
m4/libtool.m4 | 12 +-
missing | 331 ++
... => mission-control-plugins-6-uninstalled.pc.in | 10 +-
...lugins.pc.in => mission-control-plugins-6.pc.in | 10 +-
mission-control-plugins/Makefile.am | 24 +-
mission-control-plugins/Makefile.in | 77 +-
mission-control-plugins/account-storage.c | 916 +++---
mission-control-plugins/account-storage.h | 302 +-
mission-control-plugins/account.c | 318 +-
mission-control-plugins/account.h | 56 +-
mission-control-plugins/dbus-acl.c | 431 ---
mission-control-plugins/dbus-acl.h | 134 -
mission-control-plugins/debug.c | 3 +-
mission-control-plugins/debug.h | 3 +-
mission-control-plugins/dispatch-operation.c | 103 +-
mission-control-plugins/dispatch-operation.h | 13 +-
mission-control-plugins/implementation.h | 62 +-
mission-control-plugins/mission-control-plugins.h | 10 -
plugins/Makefile.am | 14 +-
plugins/Makefile.in | 187 +-
plugins/mcp-dbus-aegis-acl.c | 441 ---
server/Makefile.am | 36 +-
server/Makefile.in | 79 +-
server/im.telepathy.v1.AccountManager.service.in | 3 +
server/im.telepathy.v1.MissionControl6.service.in | 3 +
...ssion-control-5.8.in => mission-control-6.8.in} | 8 +-
...freedesktop.Telepathy.AccountManager.service.in | 3 -
...reedesktop.Telepathy.MissionControl5.service.in | 3 -
src/Makefile.am | 181 +-
src/Makefile.in | 403 +--
src/channel-utils.c | 95 +-
src/channel-utils.h | 9 +-
src/client-registry.c | 89 +-
src/connectivity-monitor.c | 65 +-
src/dispatcher.xml | 7 -
src/gtypes.c | 10 -
src/mcd-account-addressing.c | 17 +-
src/mcd-account-addressing.h | 2 +-
src/mcd-account-conditions.c | 160 -
src/mcd-account-conditions.h | 34 -
src/mcd-account-config.h | 6 +-
src/mcd-account-connection.c | 153 -
src/mcd-account-manager-default.c | 1106 ++++++-
src/mcd-account-manager-default.h | 7 +-
src/mcd-account-manager-priv.h | 3 -
src/mcd-account-manager-sso.c | 1745 ----------
src/mcd-account-manager-sso.h | 101 -
src/mcd-account-manager.c | 845 +++--
src/mcd-account-manager.h | 11 +-
src/mcd-account-priv.h | 29 -
src/mcd-account-requests.c | 8 +-
src/mcd-account.c | 1717 +++++-----
src/mcd-account.h | 38 +-
src/mcd-channel-priv.h | 6 +-
src/mcd-channel.c | 127 +-
src/mcd-channel.h | 4 +-
src/mcd-client-priv.h | 10 +-
src/mcd-client.c | 172 +-
src/mcd-connection-service-points.c | 89 +-
src/mcd-connection.c | 393 +--
src/mcd-dbusprop.c | 14 +-
src/mcd-dbusprop.h | 6 +-
src/mcd-dispatch-operation-priv.h | 5 +-
src/mcd-dispatch-operation.c | 339 +-
src/mcd-dispatcher.c | 357 +--
src/mcd-handler-map.c | 124 +-
src/mcd-manager.c | 16 +-
src/mcd-manager.h | 2 +-
src/mcd-master.c | 10 +-
src/mcd-misc.c | 3 -
src/mcd-service.c | 6 +-
src/mcd-storage-ag-hidden.c | 99 -
src/mcd-storage-ag-hidden.h | 59 -
src/mcd-storage.c | 1798 ++++++-----
src/mcd-storage.h | 44 +-
src/mcd.xml | 17 -
src/plugin-dispatch-operation.c | 40 -
src/plugin-loader.c | 16 -
src/request.c | 16 +-
src/request.h | 2 +-
tests/Makefile.am | 15 +-
tests/Makefile.in | 73 +-
tests/README | 4 +-
...unt-store-default.c => account-store-keyfile.c} | 16 +-
...unt-store-default.h => account-store-keyfile.h} | 16 +-
tests/account-store-libaccounts.c | 629 ----
tests/account-store-variant-file.c | 189 ++
...-libaccounts.h => account-store-variant-file.h} | 27 +-
tests/account-store.c | 41 +-
tests/keyfile.c | 2 +-
tests/twisted/Makefile.am | 120 +-
tests/twisted/Makefile.in | 238 +-
tests/twisted/README | 4 +-
tests/twisted/account-manager/account-basics.py | 82 +-
tests/twisted/account-manager/auto-connect.py | 78 +-
tests/twisted/account-manager/avatar-refresh.py | 70 +-
tests/twisted/account-manager/avatar.py | 10 +-
.../account-manager/backend-makes-changes.py | 103 +-
tests/twisted/account-manager/bad-cm.py | 15 +-
tests/twisted/account-manager/connectivity.py | 10 +-
tests/twisted/account-manager/crashy-cm.py | 16 +-
.../twisted/account-manager/create-auto-connect.py | 14 +-
tests/twisted/account-manager/create-twice.py | 5 +-
.../account-manager/create-with-properties.py | 37 +-
tests/twisted/account-manager/device-idle.py | 4 +-
.../twisted/account-manager/enable-auto-connect.py | 10 +-
tests/twisted/account-manager/enable.py | 6 +-
tests/twisted/account-manager/hidden.py | 110 -
tests/twisted/account-manager/irc.py | 43 +-
tests/twisted/account-manager/make-valid.py | 44 +-
tests/twisted/account-manager/nickname.py | 42 +-
tests/twisted/account-manager/param-types.py | 10 +-
tests/twisted/account-manager/presence.py | 60 +-
tests/twisted/account-manager/reconnect.py | 35 +-
.../account-manager/recover-from-disconnect.py | 86 +-
tests/twisted/account-manager/req-conn-fails.py | 12 +-
tests/twisted/account-manager/request-online.py | 40 +-
.../twisted/account-manager/restricted-storage.py | 185 ++
tests/twisted/account-manager/server-drops-us.py | 40 +-
tests/twisted/account-manager/service.py | 8 +-
tests/twisted/account-manager/update-parameters.py | 51 +-
tests/twisted/account-requests/cancel.py | 15 +-
tests/twisted/account-requests/create-text.py | 48 +-
.../delete-account-during-request.py | 22 +-
tests/twisted/account-storage/5-12.py | 29 +
tests/twisted/account-storage/5-14.py | 29 +
tests/twisted/account-storage/5-17.py | 29 +
tests/twisted/account-storage/5-99-5.py | 29 +
tests/twisted/account-storage/create-new.py | 136 +
.../account-storage/default-keyring-storage.py | 230 --
tests/twisted/account-storage/diverted-storage.py | 22 +-
tests/twisted/account-storage/load-keyfiles.py | 285 ++
tests/twisted/account-storage/storage_helper.py | 337 ++
tests/twisted/account/addressing.py | 2 +-
tests/twisted/capabilities/contact-caps.py | 32 +-
tests/twisted/constants.py | 594 +++-
tests/twisted/crash-recovery/crash-recovery.py | 17 +-
tests/twisted/dbus-account-plugin.c | 801 ++---
tests/twisted/dispatcher/already-has-channel.py | 51 +-
tests/twisted/dispatcher/already-has-obsolete.py | 221 --
tests/twisted/dispatcher/approver-fails.py | 28 +-
tests/twisted/dispatcher/bypass-approval.py | 33 +-
tests/twisted/dispatcher/bypass-observers.py | 291 --
tests/twisted/dispatcher/cancel.py | 7 +-
tests/twisted/dispatcher/capture-bundle.py | 49 +-
tests/twisted/dispatcher/cdo-claim.py | 10 +-
tests/twisted/dispatcher/connect-for-request.py | 29 +-
tests/twisted/dispatcher/create-at-startup.py | 56 +-
.../dispatcher/create-delayed-by-mini-plugin.py | 31 +-
tests/twisted/dispatcher/create-handler-fails.py | 37 +-
tests/twisted/dispatcher/create-hints.py | 54 +-
.../dispatcher/create-no-preferred-handler.py | 37 +-
.../dispatcher/create-rejected-by-mini-plugin.py | 11 +-
tests/twisted/dispatcher/create-text.py | 48 +-
.../twisted/dispatcher/created-behind-our-back.py | 22 +-
tests/twisted/dispatcher/delay-approvers.py | 14 +-
.../dispatcher/delay-then-call-handle-with.py | 18 +-
.../dispatcher/delay-then-dont-call-approvers.py | 14 +-
tests/twisted/dispatcher/dispatch-activatable.py | 14 +-
.../dispatcher/dispatch-before-connected.py | 24 +-
.../dispatcher/dispatch-delayed-by-mini-plugin.py | 44 +-
tests/twisted/dispatcher/dispatch-obsolete.py | 191 --
.../dispatcher/dispatch-rejected-by-mini-plugin.py | 21 +-
tests/twisted/dispatcher/dispatch-text.py | 91 +-
tests/twisted/dispatcher/ensure-and-redispatch.py | 70 +-
tests/twisted/dispatcher/ensure-is-approval.py | 47 +-
tests/twisted/dispatcher/ensure-rapidly.py | 48 +-
tests/twisted/dispatcher/exploding-bundles.py | 130 +-
tests/twisted/dispatcher/fdo-21034.py | 8 +-
tests/twisted/dispatcher/handle-channels-fails.py | 42 +-
tests/twisted/dispatcher/lose-text.py | 24 +-
.../twisted/dispatcher/recover-from-disconnect.py | 50 +-
tests/twisted/dispatcher/redispatch-channels.py | 31 +-
.../twisted/dispatcher/request-disabled-account.py | 13 +-
.../dispatcher/respawn-activatable-observers.py | 41 +-
tests/twisted/dispatcher/respawn-observers.py | 76 +-
tests/twisted/dispatcher/some-delay-approvers.py | 18 +-
tests/twisted/dispatcher/undispatchable.py | 6 +-
tests/twisted/dispatcher/vanishing-client.py | 2 +-
tests/twisted/fakeaccountsservice.py | 105 +-
tests/twisted/fakeclient.py | 99 -
tests/twisted/fakecm.py | 292 --
tests/twisted/mc-debug-server.c | 190 +-
tests/twisted/mcp-account-diversion.c | 300 +-
tests/twisted/mcp-dbus-caller-permission.c | 264 --
tests/twisted/mcp-plugin.c | 271 +-
tests/twisted/mctest.py | 539 ++--
tests/twisted/run-test.sh.in | 119 +-
tests/twisted/servicetest.py | 425 ++-
tests/twisted/telepathy-1/clients/AbiWord.client | 16 +
tests/twisted/telepathy-1/clients/Logger.client | 10 +
.../{telepathy => telepathy-1}/clients/README | 0
.../{telepathy => telepathy-1}/managers/README | 0
.../managers/fakecm.manager | 0
.../managers/onewitheverything.manager | 0
tests/twisted/telepathy/clients/AbiWord.client | 16 -
tests/twisted/telepathy/clients/Logger.client | 10 -
tests/twisted/tools/Makefile.am | 20 +-
tests/twisted/tools/Makefile.in | 28 +-
tests/twisted/tools/exec-with-log.sh.in | 14 +-
tests/twisted/tools/fake-startup.sh | 4 +-
tests/twisted/tools/run-mc.sh.in | 16 +-
.../servicedir-installed/Client.AbiWord.service.in | 4 +-
.../servicedir-installed/Client.Logger.service.in | 4 +-
...trol5.service.in => MissionControl6.service.in} | 2 +-
.../Client.AbiWord.service.in | 4 +-
.../Client.Logger.service.in | 4 +-
...trol5.service.in => MissionControl6.service.in} | 2 +-
tests/value-is-same.c | 2 +
tools/Makefile.am | 31 -
tools/Makefile.in | 39 +-
tools/c-constants-generator.xsl | 299 --
tools/c-interfaces-generator.xsl | 84 -
tools/doc-generator.xsl | 1199 -------
tools/glib-blocking-client-gen.py | 1014 ------
tools/glib-client-gen.py | 1269 --------
tools/glib-client-marshaller-gen.py | 60 -
tools/glib-ginterface-gen.py | 838 -----
tools/glib-gtypes-generator.py | 304 --
tools/glib-interfaces-body-generator.xsl | 47 -
tools/glib-interfaces-generator.xsl | 55 -
tools/glib-signals-marshal-gen.py | 55 -
tools/gquark-gen.py | 135 -
tools/identity.xsl | 7 -
tools/lcov.am | 2 +-
tools/libglibcodegen.py | 172 -
tools/libtpcodegen.py | 227 --
tools/spec-to-introspect.xsl | 26 -
tools/telepathy.am | 2 +-
util/Makefile.am | 14 +-
util/Makefile.in | 69 +-
util/mc-tool.c | 2003 ++++++------
util/{mc-tool.1 => mc6-tool.1} | 64 +-
...c-wait-for-name.1.in => mc6-wait-for-name.1.in} | 12 +-
util/wait-for-name.c | 96 +-
xml/Account_Interface_Conditions.xml | 99 -
...Account_Interface_External_Password_Storage.xml | 58 -
xml/Account_Interface_Hidden.xml | 65 -
xml/Account_Manager_Interface_Hidden.xml | 100 -
...Channel_Dispatcher_Interface_Messages_DRAFT.xml | 57 -
...onnection_Manager_Interface_Account_Storage.xml | 120 -
xml/Makefile.am | 33 -
xml/Makefile.in | 511 ---
xml/all.xml | 35 -
xml/generic-types.xml | 214 --
xml/nmc5.xml | 14 -
xml/telepathy-types.xml | 96 -
306 files changed, 23438 insertions(+), 27294 deletions(-)
--
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