[Pkg-telepathy-commits] [SCM] Salut packaging branch, debian, updated. debian/0.5.0-3-9-gfe61173
Jonny Lamb
jonny at debian.org
Wed Oct 5 11:33:48 UTC 2011
The following commit has been merged in the debian branch:
commit a9217aaedd83bcbeb6d90c2407f6b1dd949ad6c7
Author: Jonny Lamb <jonny at debian.org>
Date: Mon Jul 25 14:31:07 2011 +0100
debian/patches/: Removed all old patches.
diff --git a/debian/changelog b/debian/changelog
index f1bd628..0310736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
telepathy-salut (0.5.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches/: Removed all old patches.
- -- Jonny Lamb <jonny at debian.org> Mon, 25 Jul 2011 14:19:04 +0100
+ -- Jonny Lamb <jonny at debian.org> Mon, 25 Jul 2011 14:30:35 +0100
telepathy-salut (0.5.0-3) unstable; urgency=low
diff --git a/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch b/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch
deleted file mode 100644
index ece62e9..0000000
--- a/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 96bfc261c256fd6de9d727f378dc2bc43c9358b8 Mon Sep 17 00:00:00 2001
-From: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Date: Fri, 24 Jun 2011 10:10:32 +0100
-Subject: [PATCH] contact-channel: treat TP_UNKNOWN_HANDLE_TYPE has unset
- handle type
-
-Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
----
- src/contact-channel.c | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/contact-channel.c b/src/contact-channel.c
-index d87a81a..103f411 100644
---- a/src/contact-channel.c
-+++ b/src/contact-channel.c
-@@ -225,8 +225,10 @@ salut_contact_channel_set_property (GObject *object,
- priv->conn = g_value_get_object (value);
- break;
- case PROP_HANDLE_TYPE:
-- g_assert (g_value_get_uint (value) == 0
-- || g_value_get_uint (value) == TP_HANDLE_TYPE_LIST);
-+ g_assert (g_value_get_uint (value) == 0 /* old tp-glib value for unset */
-+ || g_value_get_uint (value) == TP_HANDLE_TYPE_LIST
-+ /* new tp-glib value for unset */
-+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
- break;
- case PROP_CHANNEL_TYPE:
- tmp = g_value_get_string (value);
diff --git a/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch b/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch
deleted file mode 100644
index 5714a27..0000000
--- a/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From d1e2397dc684b609ac5f9b78fd4d5b1e2b24c452 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
-Date: Sat, 25 Jun 2011 00:24:10 +0200
-Subject: [PATCH] Cope with the default value of handle-type being changed in
- new tp-glib
-
-In recent versions of tp-glib the handle-type property defaults to
-TP_UNKNOWN_HANDLE_TYPE instead of 0. Update the various assertions which
-verify a channel doesn't get constructed with an unexpected handle type
-to accept both 0 and TP_UNKNOWN_HANDLE_TYPE so we're compatible with
-both versions.
----
- src/file-transfer-channel.c | 5 ++++-
- src/im-channel.c | 7 +++++--
- src/muc-channel.c | 5 ++++-
- src/roomlist-channel.c | 6 ++++--
- 4 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c
-index 794631f..4d93a46 100644
---- a/src/file-transfer-channel.c
-+++ b/src/file-transfer-channel.c
-@@ -354,8 +354,11 @@ salut_file_transfer_channel_set_property (GObject *object,
- self->priv->connection = g_value_get_object (value);
- break;
- case PROP_HANDLE_TYPE:
-+ /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the
-+ * new version */
- g_assert (g_value_get_uint (value) == 0
-- || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT);
-+ || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT
-+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
- break;
- case PROP_CHANNEL_TYPE:
- /* these properties are writable in the interface, but not actually
-diff --git a/src/im-channel.c b/src/im-channel.c
-index 4843e38..722f1ba 100644
---- a/src/im-channel.c
-+++ b/src/im-channel.c
-@@ -250,8 +250,11 @@ salut_im_channel_set_property (GObject *object,
- priv->connection = g_value_get_object (value);
- break;
- case PROP_HANDLE_TYPE:
-- g_assert (g_value_get_uint (value) == 0 ||
-- g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT);
-+ /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the
-+ * new version */
-+ g_assert (g_value_get_uint (value) == 0
-+ || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT
-+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
- break;
- case PROP_CHANNEL_TYPE:
- tmp = g_value_get_string (value);
-diff --git a/src/muc-channel.c b/src/muc-channel.c
-index b8b0fbb..9be5bf7 100644
---- a/src/muc-channel.c
-+++ b/src/muc-channel.c
-@@ -268,8 +268,11 @@ salut_muc_channel_set_property (GObject *object,
- priv->muc_connection = g_value_get_object (value);
- break;
- case PROP_HANDLE_TYPE:
-+ /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the
-+ * new version */
- g_assert (g_value_get_uint (value) == 0
-- || g_value_get_uint (value) == TP_HANDLE_TYPE_ROOM);
-+ || g_value_get_uint (value) == TP_HANDLE_TYPE_ROOM
-+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
- break;
- case PROP_CHANNEL_TYPE:
- tmp = g_value_get_string (value);
-diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
-index aad3c48..362c37c 100644
---- a/src/roomlist-channel.c
-+++ b/src/roomlist-channel.c
-@@ -227,8 +227,10 @@ salut_roomlist_channel_set_property (GObject *object,
- break;
- case PROP_HANDLE_TYPE:
- /* this property is writable in the interface, but not actually
-- * meaningfully changable on this channel, so we do nothing */
-- g_assert (g_value_get_uint (value) == TP_HANDLE_TYPE_NONE);
-+ * meaningfully changable on this channel, so we do nothing.
-+ * */
-+ g_assert (g_value_get_uint (value) == TP_HANDLE_TYPE_NONE
-+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
- break;
- case PROP_CONNECTION:
- priv->connection = g_value_get_object (value);
---
-1.7.5.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8e4101f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch
-0002-Cope-with-the-default-value-of-handle-type-being-cha.patch
--
Salut packaging
More information about the Pkg-telepathy-commits
mailing list