diff -Nru telepathy-gabble-0.15.3/debian/changelog telepathy-gabble-0.15.3/debian/changelog --- telepathy-gabble-0.15.3/debian/changelog 2012-01-17 16:45:30.000000000 +0000 +++ telepathy-gabble-0.15.3/debian/changelog 2012-02-08 08:33:10.000000000 +0000 @@ -1,37 +1,30 @@ -telepathy-gabble (0.15.3-0ubuntu1) precise; urgency=low +telepathy-gabble (0.15.3-1ubuntu1) precise; urgency=low - * New upstream release. - - Update wocky snapshot to fix wocky_data_form_set_type() - * debian/control - - build depend on python and added python:Depends - - -- Ken VanDine Tue, 17 Jan 2012 11:05:37 -0500 - -telepathy-gabble (0.15.2-0ubuntu1) precise; urgency=low + * Merge with Debian experimental. Remaining Ubuntu changes: + - debian/telepathy-gabble.install: Install telepathy-gabble-xmpp-console. - * New upstream release. - - -- Ken VanDine Wed, 21 Dec 2011 15:55:39 -0500 + -- Martin Pitt Wed, 08 Feb 2012 09:32:43 +0100 -telepathy-gabble (0.15.1-0ubuntu1) precise; urgency=low +telepathy-gabble (0.15.3-1) experimental; urgency=low - * New upstream release. - - include a new XMPP console interface - - implements the freshly-undrafted Protocol.Interface.Addressing - and the still-unstable Connection.Interface.Addressing1, and - uses them to expose Facebook contacts' integer IDs. - - capabilities.h and caps-channel-manager.h are no longer erroneously - omitted. - * debian/control: - - Bump build-dep on libtelepathy-glib-dev to >= 0.17.2 + * Merge from unstable + * New upstream release + - increase telepathy-glib build-dependency + * Remove unused path 01-jingleinfo.diff, which is not applied (and has not + been necessary since 0.11.7) - -- Ken VanDine Fri, 09 Dec 2011 16:15:13 -0500 + -- Simon McVittie Thu, 26 Jan 2012 17:53:22 +0000 -telepathy-gabble (0.15.0-1build1) precise; urgency=low +telepathy-gabble (0.14.1-1) unstable; urgency=low - * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. + * New upstream stable release (Closes: #656601) + * Specifically mention Facebook Chat in the Description (Closes: #650459) + * Use debhelper 9, for better debug symbols and hardened build flags + (Closes: #656517) + - but don't use multiarch libdir: not useful for this package + * Standards-Version: 3.9.2 (no changes) - -- Adam Conrad Fri, 02 Dec 2011 17:29:06 -0700 + -- Simon McVittie Thu, 26 Jan 2012 17:11:14 +0000 telepathy-gabble (0.15.0-1) experimental; urgency=low @@ -40,24 +33,6 @@ -- Jonny Lamb Wed, 16 Nov 2011 18:33:10 +0000 -telepathy-gabble (0.14.0-0ubuntu1) precise; urgency=low - - * New upstream release. - - when connected to Facebook, text channels now produce 'accepted' - delivery reports when the user sends a message to a contact using - another device. - - Offline contacts to whom we have a presence subscription and also - a channel open at the time the roster arrives are now correctly - shown as offline, rather than unknown. - - implement the ContactBlocking interface - - Gabble no longer crashes if the server replies to its roster query - IQ twice (as vk.com's XMPP server does) - - Gabble now returns MAXINT64 for the subject timestamp when it is - unknown, as per the latest spec. - - Various memory leak fixes. - - -- Ken VanDine Wed, 09 Nov 2011 16:07:28 -0500 - telepathy-gabble (0.13.7-1) unstable; urgency=low * New upstream release diff -Nru telepathy-gabble-0.15.3/debian/compat telepathy-gabble-0.15.3/debian/compat --- telepathy-gabble-0.15.3/debian/compat 2011-11-16 18:33:10.000000000 +0000 +++ telepathy-gabble-0.15.3/debian/compat 2012-01-26 18:01:17.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru telepathy-gabble-0.15.3/debian/control telepathy-gabble-0.15.3/debian/control --- telepathy-gabble-0.15.3/debian/control 2012-01-17 16:13:58.000000000 +0000 +++ telepathy-gabble-0.15.3/debian/control 2012-02-08 08:33:18.000000000 +0000 @@ -1,14 +1,15 @@ Source: telepathy-gabble Section: net Priority: optional -Maintainer: Debian Telepathy maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Telepathy maintainers Uploaders: Dafydd Harries , Laurent Bigonville , Simon McVittie , Sjoerd Simons , Jonny Lamb Build-Depends: autotools-dev (>= 20100122.1~), - debhelper (>= 8), + debhelper (>= 9), gnutls-bin, libdbus-1-dev (>= 1.1.0), libdbus-glib-1-dev (>= 0.82), @@ -20,23 +21,22 @@ python, xsltproc, libsqlite3-dev, - python, libnice-dev (>= 0.0.11) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-gabble.git Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-gabble.git Homepage: http://telepathy.freedesktop.org/wiki/ Package: telepathy-gabble Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: telepathy-mission-control-5 (<< 1:5.5) Provides: telepathy-connection-manager Description: Jabber/XMPP connection manager Gabble is a Jabber/XMPP connection manager for the Telepathy framework, currently supporting single user chats, multi user chats and voice/video calls. Install this package to use Telepathy instant messaging clients - with Jabber/XMPP servers, including Google Talk. + with Jabber/XMPP servers, including Google Talk and Facebook Chat. Package: telepathy-gabble-dbg Priority: extra diff -Nru telepathy-gabble-0.15.3/debian/patches/01-jingleinfo.diff telepathy-gabble-0.15.3/debian/patches/01-jingleinfo.diff --- telepathy-gabble-0.15.3/debian/patches/01-jingleinfo.diff 2011-11-16 18:33:10.000000000 +0000 +++ telepathy-gabble-0.15.3/debian/patches/01-jingleinfo.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -From 5ab349b6837389d21a2664a71db464d1b9c6644c Mon Sep 17 00:00:00 2001 -From: Will Thompson -Date: Tue, 8 Feb 2011 18:43:21 +0000 -Subject: [PATCH] Ignore google:jingleinfo pushes from contacts. - -Previously, Gabble would erroneously process google:jingleinfo updates -sent by anybody, rather than only paying attention to those sent by the -user's server. This may theoretically allow an attacker to trick Gabble -into relaying streamed media through a server of the attacker's -choosing, enabling them to intercept, obstruct or modify the user's -audio and video calls. - -This patch addresses this flaw, following the same pattern as the -corresponding check in the roster code. - -Note that even without this flaw, no security guarantees on media in -calls can be provided in the presence of malicious network admins or -insecure networks: an attacker who can eavesdrop the network traffic -still has the ability to intercept the content of the call, as the media -is transmitted unencrypted. ---- - src/jingle-factory.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/src/jingle-factory.c b/src/jingle-factory.c -index 0ad4d6b..02add56 100644 ---- a/src/jingle-factory.c -+++ b/src/jingle-factory.c -@@ -254,6 +254,22 @@ got_jingle_info_stanza (GabbleJingleFactory *fac, - GabbleJingleFactoryPrivate *priv = fac->priv; - LmMessageSubType sub_type; - LmMessageNode *query_node, *node; -+ const gchar *from = wocky_node_get_attribute (wocky_stanza_get_top_node (message), "from"); -+ -+ if (from != NULL) -+ { -+ TpBaseConnection *base_conn = TP_BASE_CONNECTION (priv->conn); -+ TpHandleRepoIface *contact_repo = tp_base_connection_get_handles ( -+ base_conn, TP_HANDLE_TYPE_CONTACT); -+ TpHandle sender = tp_handle_lookup (contact_repo, from, NULL, NULL); -+ -+ if (sender != base_conn->self_handle) -+ { -+ DEBUG ("ignoring jingleinfo from '%s', not ourself nor the server", -+ from); -+ return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; -+ } -+ } - - query_node = lm_message_node_get_child_with_namespace ( - wocky_stanza_get_top_node (message), "query", NS_GOOGLE_JINGLE_INFO); --- -1.7.2.3 - diff -Nru telepathy-gabble-0.15.3/debian/rules telepathy-gabble-0.15.3/debian/rules --- telepathy-gabble-0.15.3/debian/rules 2011-12-09 22:01:42.000000000 +0000 +++ telepathy-gabble-0.15.3/debian/rules 2012-01-26 18:01:17.000000000 +0000 @@ -1,12 +1,15 @@ #!/usr/bin/make -f %: - dh $@ --with autotools_dev --fail_missing + dh $@ --with autotools_dev -# dh_auto_configure defaults to one libexecdir per source package, which is -# overkill for Telepathy. +# Now that we use debhelper 9, dh_auto_configure defaults to +# $libexecdir=$libdir, which might be better than this, but doesn't match +# our historical practice (so it'd break old debugging instructions). +# Leaving it as it was for now... override_dh_auto_configure: dh_auto_configure -- \ + --libdir="\$${prefix}/lib" \ --libexecdir="\$${prefix}/lib/telepathy" \ --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt