[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian, updated. debian/0.16.0-3-7-gba87263
Laurent Bigonville
bigon at bigon.be
Wed Jun 27 11:42:32 UTC 2012
The following commit has been merged in the debian branch:
commit e573c2c005c398a7e2923e3c44fa5507ce2484eb
Author: Laurent Bigonville <bigon at bigon.be>
Date: Wed Jun 27 13:14:33 2012 +0200
Drop all patches: all of them are included in this new release
diff --git a/debian/changelog b/debian/changelog
index 4a6144f..8fdfba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ telepathy-gabble (0.16.1-1) UNRELEASED; urgency=low
* New upstream release.
- Bump libglib2.0-dev build-dependency to 2.30
* debian/watch: Do not call uupdate
+ * Drop all patches: all of them are included in this new release
- -- Laurent Bigonville <bigon at debian.org> Wed, 27 Jun 2012 12:58:30 +0200
+ -- Laurent Bigonville <bigon at debian.org> Wed, 27 Jun 2012 13:12:11 +0200
telepathy-gabble (0.16.0-3) unstable; urgency=low
diff --git a/debian/patches/Fix-for-initiating-a-video-call-from-an-Android-tabl.patch b/debian/patches/Fix-for-initiating-a-video-call-from-an-Android-tabl.patch
deleted file mode 100644
index 275d8a0..0000000
--- a/debian/patches/Fix-for-initiating-a-video-call-from-an-Android-tabl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 287fb2d9fabd2703c17020c4fd9493e8531c0a03 Mon Sep 17 00:00:00 2001
-From: Marcus Lundblad <ml at update.uu.se>
-Date: Fri, 18 May 2012 13:29:12 +0200
-Subject: [PATCH 2/2] Fix for initiating a video call from an Android tablet.
-
-Reviewed-by: Sjoerd Simons <sjoerd at greynoise.nl>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36998
----
- gabble/capabilities.h | 2 ++
- src/jingle-media-rtp.c | 4 +++-
- src/presence-cache.c | 12 ++++++++++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/gabble/capabilities.h b/gabble/capabilities.h
-index 2e31755..81c8c25 100644
---- a/gabble/capabilities.h
-+++ b/gabble/capabilities.h
-@@ -33,6 +33,8 @@
- #define QUIRK_OMITS_CONTENT_CREATORS "\x07omits-content-creators"
- /* The Google Webmail client doesn't support some features */
- #define QUIRK_GOOGLE_WEBMAIL_CLIENT "\x07google-webmail-client"
-+/* The Android GTalk client needs a quirk for component names */
-+#define QUIRK_ANDROID_GTALK_CLIENT "\x07android-gtalk-client"
-
- /* Some useful capability sets for Jingle etc. */
- const GabbleCapabilitySet *gabble_capabilities_get_legacy (void);
-diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
-index 9a12007..45a1419 100644
---- a/src/jingle-media-rtp.c
-+++ b/src/jingle-media-rtp.c
-@@ -337,7 +337,9 @@ static void transport_created (GabbleJingleContent *content,
- if (priv->media_type == JINGLE_MEDIA_TYPE_VIDEO &&
- (JINGLE_IS_GOOGLE_DIALECT (dialect) ||
- gabble_jingle_session_peer_has_cap (content->session,
-- QUIRK_GOOGLE_WEBMAIL_CLIENT)))
-+ QUIRK_GOOGLE_WEBMAIL_CLIENT) ||
-+ gabble_jingle_session_peer_has_cap (content->session,
-+ QUIRK_ANDROID_GTALK_CLIENT)))
- {
- jingle_transport_google_set_component_name (gtrans, "video_rtp", 1);
- jingle_transport_google_set_component_name (gtrans, "video_rtcp", 2);
-diff --git a/src/presence-cache.c b/src/presence-cache.c
-index b5a0dab..31a3012 100644
---- a/src/presence-cache.c
-+++ b/src/presence-cache.c
-@@ -1042,6 +1042,18 @@ _parse_node (GabblePresence *presence,
- gabble_presence_set_capabilities (presence, resource, cap_set, NULL, serial);
- gabble_capability_set_free (cap_set);
- }
-+
-+ if (!tp_strdiff (node, "http://www.android.com/gtalk/client/caps") ||
-+ !tp_strdiff (node, "http://www.android.com/gtalk/client/caps2"))
-+ {
-+ GabbleCapabilitySet *cap_set = gabble_capability_set_new ();
-+
-+ DEBUG ("Client is Android GTalk Client");
-+
-+ gabble_capability_set_add (cap_set, QUIRK_ANDROID_GTALK_CLIENT);
-+ gabble_presence_set_capabilities (presence, resource, cap_set, NULL, serial);
-+ gabble_capability_set_free (cap_set);
-+ }
- }
-
-
---
-1.7.10
-
diff --git a/debian/patches/Make-Android-4.0-GTalk-contacts-appear-as-capable-of.patch b/debian/patches/Make-Android-4.0-GTalk-contacts-appear-as-capable-of.patch
deleted file mode 100644
index 162be7c..0000000
--- a/debian/patches/Make-Android-4.0-GTalk-contacts-appear-as-capable-of.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bced2f61312ab407964ac3ef0653183eb3b8c6cc Mon Sep 17 00:00:00 2001
-From: Marcus Lundblad <ml at update.uu.se>
-Date: Tue, 15 May 2012 22:40:04 +0200
-Subject: [PATCH 1/2] Make Android 4.0 GTalk contacts appear as capable of a/v
- calls.
-
-Reviewed-by: Sjoerd Simons <sjoerd at greynoise.nl>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36998
----
- src/presence-cache.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/presence-cache.c b/src/presence-cache.c
-index 22e025c..b5a0dab 100644
---- a/src/presence-cache.c
-+++ b/src/presence-cache.c
-@@ -509,6 +509,8 @@ gabble_presence_cache_add_bundles (GabblePresenceCache *cache)
- gabble_presence_cache_add_bundle_caps (cache, \
- "http://www.android.com/gtalk/client/caps#" cap, features); \
- gabble_presence_cache_add_bundle_caps (cache, \
-+ "http://www.android.com/gtalk/client/caps2#" cap, features); \
-+ gabble_presence_cache_add_bundle_caps (cache, \
- "http://talk.google.com/xmpp/bot/caps#" cap, features);
-
- /* Cache various bundle from the Google Talk clients as trusted. Some old
---
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 82141d7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Make-Android-4.0-GTalk-contacts-appear-as-capable-of.patch
-Fix-for-initiating-a-video-call-from-an-Android-tabl.patch
--
telepathy-gabble packaging
More information about the Pkg-telepathy-commits
mailing list