[Pkg-telepathy-commits] [telepathy-gabble-1] 03/05: Merge tag 'upstream/0.99.8+20+gc3c3bb5' into tmp
Simon McVittie
smcv at debian.org
Thu Mar 27 20:05:39 UTC 2014
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 fce40c3ded45042442b492c3faa2bf3bc6c0f5ba
Merge: 231dbc5 97a74f7
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 18:31:10 2014 +0000
Merge tag 'upstream/0.99.8+20+gc3c3bb5' into tmp
Upstream version 0.99.8+20+gc3c3bb5
ChangeLog | 2048 ++++++++++++-
Makefile.am | 2 +-
Makefile.in | 18 +-
NEWS | 54 +-
compile => build-aux/compile | 0
config.guess => build-aux/config.guess | 0
config.sub => build-aux/config.sub | 0
depcomp => build-aux/depcomp | 0
install-sh => build-aux/install-sh | 0
ltmain.sh => build-aux/ltmain.sh | 0
missing => build-aux/missing | 0
test-driver => build-aux/test-driver | 0
config.h.in | 12 +-
configure | 145 +-
configure.ac | 59 +-
data/Makefile.am | 6 +-
data/Makefile.in | 7 +-
data/gabble.service.in | 4 +-
docs/Makefile.am | 3 +-
docs/Makefile.in | 4 +-
docs/olpc.xml | 797 -----
...lepathy-gabble.8.in => telepathy-gabble-1.8.in} | 6 +-
extensions/Channel_Type_FileTransfer_Future.xml | 67 -
extensions/Connection_Future.xml | 110 -
extensions/Connection_Interface_Addressing.xml | 245 --
extensions/Connection_Interface_Gabble_Decloak.xml | 113 -
extensions/Gabble_Plugin_Console.xml | 4 +-
extensions/Gabble_Plugin_Gateways.xml | 10 +-
extensions/Gabble_Plugin_Test.xml | 2 +-
extensions/Makefile.am | 8 +-
extensions/Makefile.in | 56 +-
extensions/OLPC_Activity_Properties.xml | 124 -
extensions/OLPC_Buddy_Info.xml | 285 --
extensions/all.xml | 20 -
gabble/Makefile.am | 2 +-
gabble/Makefile.in | 15 +-
gabble/capabilities.h | 1 -
....pc.in => telepathy-gabble-1-uninstalled.pc.in} | 4 +-
...pathy-gabble.pc.in => telepathy-gabble-1.pc.in} | 6 +-
lib/Makefile.in | 1 +
lib/ext/Makefile.in | 1 +
lib/ext/wocky/INSTALL | 12 +-
lib/ext/wocky/Makefile.am | 4 +-
lib/ext/wocky/Makefile.in | 323 +-
lib/ext/wocky/aclocal.m4 | 666 ++--
lib/ext/wocky/compile | 347 ---
lib/ext/wocky/configure | 578 +---
lib/ext/wocky/configure.ac | 2 +-
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 | 20 +-
.../reference/html/WockyJingleTransportIface.html | 20 +-
.../docs/reference/html/WockyTLSConnector.html | 4 +-
.../wocky/docs/reference/html/WockyTLSHandler.html | 8 +-
.../wocky/docs/reference/html/api-index-full.html | 58 +-
lib/ext/wocky/docs/reference/html/ch01.html | 2 +-
lib/ext/wocky/docs/reference/html/index.html | 2 +-
lib/ext/wocky/docs/reference/html/index.sgml | 117 +-
lib/ext/wocky/docs/reference/html/object-tree.html | 11 +-
...penSSL-TLS.html => wocky-Wocky-GnuTLS-TLS.html} | 129 +-
.../reference/html/wocky-wocky-jingle-types.html | 452 +--
lib/ext/wocky/docs/reference/html/wocky.devhelp2 | 87 +-
lib/ext/wocky/examples/Makefile.in | 181 +-
lib/ext/wocky/examples/dump-certificates.c | 16 +-
lib/ext/wocky/install-sh | 14 +-
lib/ext/wocky/ltmain.sh | 4 +-
lib/ext/wocky/m4/Makefile.in | 101 +-
lib/ext/wocky/m4/libtool.m4 | 12 +-
lib/ext/wocky/missing | 414 ++-
lib/ext/wocky/tests/Makefile.am | 5 +-
lib/ext/wocky/tests/Makefile.in | 225 +-
lib/ext/wocky/tests/certs/crl/ca-0-crl.pem | 13 +
lib/ext/wocky/tests/certs/crl/e7df1717.r0 | 13 +
lib/ext/wocky/tests/wocky-porter-test.c | 104 +-
lib/ext/wocky/tests/wocky-test-sasl-auth-server.c | 91 +-
lib/ext/wocky/tools/Makefile.in | 101 +-
lib/ext/wocky/wocky/Makefile.in | 232 +-
lib/ext/wocky/wocky/wocky-jingle-transport-iface.c | 12 +
lib/ext/wocky/wocky/wocky-jingle-transport-iface.h | 5 +
lib/ext/wocky/wocky/wocky-tls.c | 2 +-
lib/gibber/Makefile.in | 22 +-
lib/gibber/gibber-debug.c | 4 -
lib/gibber/gibber-debug.h | 16 -
m4/Makefile.in | 1 +
plugins/Makefile.am | 15 +-
plugins/Makefile.in | 69 +-
plugins/console/channel-manager.c | 279 ++
plugins/console/channel-manager.h | 52 +
plugins/{console.c => console/channel.c} | 315 +-
plugins/console/channel.h | 53 +
src/legacy-caps.c => plugins/console/debug.c | 36 +-
src/conn-client-types.h => plugins/console/debug.h | 26 +-
plugins/console/plugin.c | 91 +
plugins/{console.h => console/plugin.h} | 37 -
plugins/gateways.c | 10 +-
...mpp-console => telepathy-gabble-1-xmpp-console} | 165 +-
plugins/test.c | 6 +-
src/Makefile.am | 28 +-
src/Makefile.in | 208 +-
src/auth-manager.c | 13 +-
src/auth-manager.h | 2 +-
src/bytestream-factory.c | 10 +-
src/bytestream-ibb.c | 4 +-
src/bytestream-iface.c | 2 +-
src/bytestream-muc.c | 10 +-
src/bytestream-multiple.c | 4 +-
src/bytestream-socks5.c | 6 +-
src/call-channel.c | 4 +-
src/call-content.c | 4 +-
src/call-muc-channel.c | 22 +-
src/call-stream.c | 6 +-
src/capabilities.c | 25 +-
src/conn-addressing.c | 92 +-
src/conn-addressing.h | 5 +
src/conn-aliasing.c | 234 +-
src/conn-aliasing.h | 6 +
src/conn-avatars.c | 465 +--
src/conn-avatars.h | 14 +
src/conn-client-types.c | 89 +-
src/conn-client-types.h | 5 +
src/conn-contact-info.c | 149 +-
src/conn-contact-info.h | 5 +
src/conn-location.c | 173 +-
src/conn-location.h | 5 +
src/conn-mail-notif.c | 40 +-
src/conn-olpc.c | 3081 -------------------
src/conn-olpc.h | 44 -
src/conn-power-saving.c | 18 +-
src/conn-presence.c | 170 +-
src/conn-presence.h | 4 -
src/conn-sidecars.c | 24 +-
src/conn-sidecars.h | 2 +-
src/conn-util.c | 2 +-
src/connection.c | 729 +----
src/connection.h | 26 +-
src/debug.c | 1 -
src/debug.h | 36 +-
src/ft-channel.c | 159 +-
src/ft-manager.c | 107 +-
src/gabble.c | 8 -
src/im-channel.c | 39 +-
src/im-factory.c | 78 +-
src/im-factory.h | 3 +
src/jingle-mint.c | 2 +-
src/legacy-caps.h | 42 -
src/media-channel-hold.c | 423 ---
src/media-channel-internal.h | 93 -
src/media-channel.c | 3184 --------------------
src/media-channel.h | 82 -
src/media-factory.c | 619 +---
src/media-factory.h | 18 +-
src/media-stream.c | 2085 -------------
src/media-stream.h | 119 -
src/message-util.c | 22 +-
src/muc-channel.c | 243 +-
src/muc-factory.c | 252 +-
src/muc-tube-dbus.c | 4 +-
src/muc-tube-stream.c | 4 +-
src/namespaces.h | 6 -
src/olpc-activity.c | 260 --
src/olpc-activity.h | 77 -
src/plugin-loader.c | 9 +-
src/presence-cache.c | 281 +-
src/presence-cache.h | 9 -
src/presence.c | 14 -
src/private-tubes-factory.c | 319 +-
src/private-tubes-factory.h | 4 +-
src/protocol.c | 44 +-
src/roomlist-channel.c | 54 +-
src/roomlist-manager.c | 52 +-
src/roster.c | 570 ++--
src/search-channel.c | 63 +-
src/search-manager.c | 31 +-
src/server-sasl-channel.c | 92 +-
src/server-sasl-channel.h | 2 +-
src/server-tls-channel.c | 14 +-
src/server-tls-manager.c | 21 +-
src/server-tls-manager.h | 2 +-
src/tls-certificate.c | 12 +-
src/tube-dbus.c | 94 +-
src/tube-dbus.h | 2 +-
src/tube-iface.c | 10 +-
src/tube-iface.h | 6 +
src/tube-stream.c | 114 +-
src/tube-stream.h | 2 +-
src/util.c | 8 +-
src/vcard-manager.c | 67 +-
src/write-mgr-file.c | 95 +-
tests/Makefile.in | 27 +-
tests/suppressions/Makefile.in | 1 +
tests/test-handles.c | 10 +-
tests/twisted/Makefile.am | 100 +-
tests/twisted/Makefile.in | 250 +-
tests/twisted/addressing.py | 6 +-
tests/twisted/avatar-requirements.py | 20 +-
tests/twisted/caps/advertise-contact-caps.py | 26 +-
tests/twisted/caps/advertise-legacy.py | 110 -
tests/twisted/caps/caps-cache.py | 14 +-
tests/twisted/caps/caps-persistent-cache.py | 12 +-
tests/twisted/caps/from-bare-jid.py | 23 +-
tests/twisted/caps/hashed-caps.py | 129 +-
tests/twisted/caps/jingle-caps.py | 66 +-
tests/twisted/caps/offline.py | 13 +-
tests/twisted/caps/receive-jingle.py | 117 +-
tests/twisted/caps/trust-thyself.py | 25 +-
tests/twisted/caps/tube-caps.py | 32 +-
tests/twisted/caps_helper.py | 80 +-
tests/twisted/client-types.py | 50 +-
tests/twisted/cm/protocol.py | 23 +-
tests/twisted/connect/test-twice.py | 26 +-
tests/twisted/console.py | 28 +-
tests/twisted/constants.py | 271 +-
tests/twisted/dataforms.py | 6 +-
.../twisted/file-transfer/file_transfer_helper.py | 32 +-
tests/twisted/file-transfer/ft-client-caps.py | 42 +-
tests/twisted/file-transfer/metadata.py | 2 +-
.../file-transfer/test-caps-file-transfer.py | 22 +-
tests/twisted/file-transfer/test-ibb-too-early.py | 2 +-
.../file-transfer/test-send-file-declined.py | 4 +-
.../test-send-file-send-before-accept.py | 4 -
.../test-send-file-to-unknown-contact.py | 2 +-
tests/twisted/gabbletest.py | 7 +-
tests/twisted/gateways.py | 13 +-
tests/twisted/jingle-share/file_transfer_helper.py | 43 +-
tests/twisted/jingle-share/jingleshareutils.py | 20 +-
.../jingle-share/test-caps-file-transfer.py | 24 +-
tests/twisted/jingle-share/test-multift.py | 64 +-
tests/twisted/jingle/accept-extra-stream.py | 198 --
tests/twisted/jingle/call-basics.py | 4 -
tests/twisted/jingle/call-codecoffer.py | 56 +-
tests/twisted/jingle/call-google-relay.py | 2 +-
tests/twisted/jingle/call-hold-av.py | 4 +-
tests/twisted/jingle/call-muc-re-re-request.py | 4 +-
tests/twisted/jingle/call-muc.py | 10 +-
tests/twisted/jingle/call-state.py | 288 --
tests/twisted/jingle/call_helper.py | 40 +-
tests/twisted/jingle/callutils.py | 8 +-
tests/twisted/jingle/decloak-peer.py | 66 -
tests/twisted/jingle/dtmf-no-audio.py | 81 -
tests/twisted/jingle/dtmf.py | 186 --
tests/twisted/jingle/google-relay.py | 424 ---
tests/twisted/jingle/hold-audio.py | 425 ---
tests/twisted/jingle/hold-av.py | 481 ---
tests/twisted/jingle/incoming-basics.py | 191 --
tests/twisted/jingle/incoming-call-stream-error.py | 107 -
.../twisted/jingle/incoming-gmail-modern-jingle.py | 190 --
tests/twisted/jingle/initial-audio-video.py | 192 --
tests/twisted/jingle/jingletest2.py | 8 +-
tests/twisted/jingle/misuse.py | 52 -
tests/twisted/jingle/outgoing-basics.py | 349 ---
tests/twisted/jingle/outgoing-ensure.py | 217 --
tests/twisted/jingle/outgoing-many-streams.py | 221 --
tests/twisted/jingle/payload-types.py | 108 -
tests/twisted/jingle/session-id-collision.py | 4 +-
.../jingle/stream-errors-on-content-reject.py | 246 --
tests/twisted/jingle/stream-errors-on-terminate.py | 140 -
tests/twisted/jingle/stream-handler-error.py | 64 -
tests/twisted/jingle/stun-server.py | 170 +-
.../twisted/jingle/test-content-adding-removal.py | 168 --
tests/twisted/jingle/test-content-complex.py | 257 --
tests/twisted/jingle/test-description-info.py | 213 --
tests/twisted/jingle/test-incoming-call-reject.py | 112 -
tests/twisted/jingle/test-incoming-iceudp.py | 104 -
.../twisted/jingle/test-outgoing-call-rejected.py | 86 -
tests/twisted/jingle/test-outgoing-iceudp.py | 162 -
.../jingle/test-wait-for-caps-incomplete.py | 71 -
tests/twisted/jingle/test-wait-for-caps.py | 99 -
tests/twisted/jingle/transport-info-parsing.py | 86 -
tests/twisted/last-activity.py | 2 +-
tests/twisted/mail-notification.py | 3 +-
tests/twisted/muc/avatars.py | 12 +-
tests/twisted/muc/chat-states.py | 4 +-
tests/twisted/muc/conference.py | 3 +-
tests/twisted/muc/kicked.py | 11 +-
tests/twisted/muc/name-conflict.py | 14 +-
tests/twisted/muc/password.py | 10 +-
tests/twisted/muc/presence-before-closing.py | 19 +-
tests/twisted/muc/renamed.py | 13 +-
tests/twisted/muc/room-config.py | 12 +-
tests/twisted/muc/room.py | 5 +-
tests/twisted/muc/roomlist.py | 130 +-
tests/twisted/muc/scrollback.py | 8 +-
tests/twisted/muc/send-error.py | 39 +-
tests/twisted/muc/subject.py | 5 +-
tests/twisted/muc/test-ensure.py | 34 +-
tests/twisted/muc/test-muc-alias.py | 37 +-
tests/twisted/muc/test-muc-invitation.py | 61 +-
tests/twisted/muc/test-muc-ownership.py | 33 +-
tests/twisted/muc/test-muc.py | 59 +-
tests/twisted/mucutil.py | 24 +-
tests/twisted/ns.py | 10 -
tests/twisted/olpc/change-notifications.py | 32 -
tests/twisted/olpc/current-activity.py | 65 -
tests/twisted/olpc/olpc-muc-invitation.py | 233 --
tests/twisted/olpc/olpc-muc-prop-change.py | 402 ---
tests/twisted/olpc/test-olpc-bundle.py | 74 -
tests/twisted/olpc/test-olpc-set-props-preload.py | 54 -
tests/twisted/olpc/util.py | 88 -
tests/twisted/pep-support.py | 5 +-
tests/twisted/plugin-channel-managers.py | 10 +-
tests/twisted/power-save.py | 10 +-
tests/twisted/presence/decloak.py | 71 -
tests/twisted/presence/error.py | 2 +-
tests/twisted/presence/initial-contact-presence.py | 8 +-
tests/twisted/presence/initial-presence.py | 4 +-
tests/twisted/presence/invisible_xep_0126.py | 44 +-
tests/twisted/presence/invisible_xep_0186.py | 24 +-
tests/twisted/presence/plugins.py | 12 +-
tests/twisted/presence/presence.py | 19 +-
tests/twisted/presence/set-idempotence.py | 32 +-
tests/twisted/presence/shared-status.py | 29 +-
tests/twisted/presence_helper.py | 8 +
tests/twisted/pubsub.py | 1 -
tests/twisted/roster/authorize.py | 120 +-
tests/twisted/roster/edit-before-roster.py | 2 +-
tests/twisted/roster/ensure.py | 53 -
tests/twisted/roster/groups-12791.py | 54 +-
tests/twisted/roster/groups.py | 60 +-
tests/twisted/roster/initial-aliases.py | 13 +-
tests/twisted/roster/push-from-contact.py | 14 +-
tests/twisted/roster/push-without-id.py | 20 +-
tests/twisted/roster/removed-from-rp-subscribe.py | 84 +-
tests/twisted/roster/request-group-after-roster.py | 46 -
.../twisted/roster/request-group-before-roster.py | 48 -
tests/twisted/roster/test-google-roster.py | 236 +-
tests/twisted/roster/test-roster-item-deletion.py | 48 +-
tests/twisted/roster/test-roster-subscribe.py | 124 +-
tests/twisted/roster/test-roster.py | 39 +-
tests/twisted/roster/test-save-alias-to-roster.py | 36 +-
tests/twisted/rostertest.py | 193 +-
tests/twisted/run-test.sh.in | 140 +-
tests/twisted/sasl/abort.py | 4 +-
tests/twisted/sasl/close.py | 2 -
tests/twisted/sasl/complex.py | 4 +-
tests/twisted/sasl/jabber_auth.py | 10 +-
tests/twisted/sasl/plain.py | 7 -
tests/twisted/sasl/saslutil.py | 19 +-
tests/twisted/sasl/telepathy-password.py | 2 +-
tests/twisted/search/search_helper.py | 2 +-
tests/twisted/servicetest.py | 261 +-
tests/twisted/sidecar-own-caps.py | 7 +-
tests/twisted/sidecars.py | 22 +-
tests/twisted/test-debug.py | 39 +-
tests/twisted/test-fallback-socks5-proxy.py | 10 +-
tests/twisted/test-location.py | 31 +-
tests/twisted/text/destroy.py | 63 +-
tests/twisted/text/ensure.py | 58 +-
tests/twisted/text/facebook-own-message.py | 2 +-
tests/twisted/text/initiate-requestotron.py | 26 +-
tests/twisted/text/initiate.py | 46 +-
tests/twisted/text/receipts.py | 11 +-
tests/twisted/text/respawn.py | 84 +-
tests/twisted/text/send-error.py | 61 +-
tests/twisted/text/send-to-correct-resource.py | 14 +-
tests/twisted/text/test-chat-state.py | 39 +-
tests/twisted/text/test-text-delayed.py | 22 +-
tests/twisted/text/test-text-no-body.py | 8 +-
tests/twisted/text/test-text.py | 83 +-
tests/twisted/tls/server-tls-channel.py | 16 +-
tests/twisted/tools/exec-with-log.sh.in | 9 +-
.../tools/servicedir-uninstalled/gabble.service.in | 2 +-
tests/twisted/tools/servicedir/gabble.service.in | 2 +-
tests/twisted/tubes/accept-muc-dbus-tube.py | 25 +-
tests/twisted/tubes/accept-muc-stream-tube.py | 59 +-
tests/twisted/tubes/accept-private-dbus-tube.py | 12 +-
tests/twisted/tubes/accept-private-stream-tube.py | 13 +-
tests/twisted/tubes/check-create-tube-return.py | 6 +-
tests/twisted/tubes/close-muc-with-closed-tube.py | 56 +-
tests/twisted/tubes/ensure-si-tube.py | 22 +-
tests/twisted/tubes/offer-muc-dbus-tube.py | 44 +-
tests/twisted/tubes/offer-muc-stream-tube.py | 36 +-
tests/twisted/tubes/offer-private-dbus-tube.py | 19 +-
tests/twisted/tubes/offer-private-stream-tube.py | 24 +-
tests/twisted/tubes/test-get-available-tubes.py | 14 +-
tests/twisted/tubes/test-socks5-muc.py | 10 +-
tests/twisted/tubes/tubetestutil.py | 54 +-
tests/twisted/vcard/disconnect-during-pep.py | 7 +-
tests/twisted/vcard/get-contact-info.py | 14 +-
tests/twisted/vcard/overlapping-sets.py | 2 +-
tests/twisted/vcard/refresh-contact-info.py | 2 +-
tests/twisted/vcard/set-contact-info.py | 2 +-
tests/twisted/vcard/set-set-disconnect.py | 5 +-
tests/twisted/vcard/test-alias-empty-vcard.py | 2 +-
tests/twisted/vcard/test-alias-message.py | 33 +-
tests/twisted/vcard/test-alias-pep.py | 9 +-
tests/twisted/vcard/test-alias.py | 4 +-
tests/twisted/vcard/test-avatar-async.py | 31 +-
tests/twisted/vcard/test-avatar-retrieved.py | 2 +-
tests/twisted/vcard/test-avatar-tokens.py | 11 +-
tests/twisted/vcard/test-avatar.py | 12 +-
tests/twisted/vcard/test-set-alias.py | 10 +-
tests/twisted/vcard/test-vcard-cache.py | 11 +-
tests/twisted/vcard/test-vcard-race.py | 3 +-
tests/twisted/vcard/update-get-failed.py | 2 +-
tests/twisted/version.py | 2 +-
tools/Makefile.am | 1 -
tools/Makefile.in | 2 +-
tools/c-constants-gen.py | 20 +-
tools/check-coding-style.mk | 2 +-
tools/glib-client-gen.py | 894 ++----
tools/glib-client-marshaller-gen.py | 20 +-
tools/glib-errors-check-gen.py | 61 +-
tools/glib-errors-str-gen.py | 14 +-
tools/glib-ginterface-gen.py | 389 +--
tools/glib-gtypes-generator.py | 14 +-
tools/glib-interfaces-gen.py | 14 +-
tools/gobject-foo.py | 2 +-
tools/lcov.am | 2 +-
tools/libglibcodegen.py | 282 +-
tools/libtpcodegen.py | 32 +-
tools/make-version-script.py | 32 +-
tools/manager-file.py | 187 --
tools/telepathy-glib.supp | 79 +-
tools/telepathy.am | 2 +-
tools/xincludator.py | 13 +-
416 files changed, 10565 insertions(+), 30101 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble-1.git
More information about the Pkg-telepathy-commits
mailing list