[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.3.2-3-3-gd01cd69

[Simon McVittie]

The following commit has been merged in the debian branch:
commit d01cd69f3786cf1a7d666670ef3d66811181e9bf
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Apr 15 20:33:51 2010 +0100

    New upstream release
    
    * New upstream release
    * Remove patch from previous release, no longer needed

diff --git a/debian/changelog b/debian/changelog
index a45c302..acc9d09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-mission-control-5 (5.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove patch from previous release, no longer needed
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 15 Apr 2010 20:33:37 +0100
+
 telepathy-mission-control-5 (5.3.2-3) unstable; urgency=low
 
   * debian/update-patches.mk: updated
diff --git a/debian/patches/0001-Only-time-out-channel-requests-after-many-hours.patch b/debian/patches/0001-Only-time-out-channel-requests-after-many-hours.patch
deleted file mode 100644
index e4b9e9b..0000000
--- a/debian/patches/0001-Only-time-out-channel-requests-after-many-hours.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5fe707c2415dfbf917a2e918c0c7238e2f159df8 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Mon, 1 Mar 2010 13:58:58 +0000
-Subject: [PATCH] Only time out channel requests after many hours
-
-Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
----
- src/mcd-connection.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/mcd-connection.c b/src/mcd-connection.c
-index 72d2bd3..8cfe1bd 100644
---- a/src/mcd-connection.c
-+++ b/src/mcd-connection.c
-@@ -2363,14 +2363,16 @@ request_channel_new_iface (McdConnection *connection, McdChannel *channel)
-     properties = _mcd_channel_get_requested_properties (channel);
-     if (_mcd_channel_get_request_use_existing (channel))
-     {
-+        /* Timeout of 5 hours: 5 * 3600 * 1000 */
-         tp_cli_connection_interface_requests_call_ensure_channel
--            (priv->tp_conn, -1, properties, ensure_channel_cb,
-+            (priv->tp_conn, 18000000, properties, ensure_channel_cb,
-              connection, NULL, (GObject *)channel);
-     }
-     else
-     {
-+        /* Timeout of 5 hours: 5 * 3600 * 1000 */
-         tp_cli_connection_interface_requests_call_create_channel
--            (priv->tp_conn, -1, properties, create_channel_cb,
-+            (priv->tp_conn, 18000000, properties, create_channel_cb,
-              connection, NULL, (GObject *)channel);
-     }
-     return TRUE;

-- 
MC 5 packaging