[Pkg-telepathy-commits] [telepathy-glib] 59/60: Remove workaround for #709781, fixed in GLib

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit 52fce4f92489fd5af1c8a1cc3a92699ed42a867d
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Sep 24 16:28:45 2013 +0100

    Remove workaround for #709781, fixed in GLib
---
 debian/changelog                                   |    1 +
 ...rt-about-debug-messages-dates-times-on-sp.patch |   46 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e204c84..c9e5535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ telepathy-glib (0.21.2-1) UNRELEASED; urgency=low
 
   * New upstream release (release candidate for 0.22)
     - add new ABI to symbols file
+  * Remove workaround for #709781, fixed in GLib
 
  -- Simon McVittie <smcv at debian.org>  Tue, 24 Sep 2013 16:25:00 +0100
 
diff --git a/debian/patches/0001-Do-not-assert-about-debug-messages-dates-times-on-sp.patch b/debian/patches/0001-Do-not-assert-about-debug-messages-dates-times-on-sp.patch
deleted file mode 100644
index 7a03d32..0000000
--- a/debian/patches/0001-Do-not-assert-about-debug-messages-dates-times-on-sp.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sat, 25 May 2013 13:21:48 +0100
-Subject: Do not assert about debug messages' dates/times on sparc
-
-Workaround for <http://bugs.debian.org/709781>.
-
-Bug-Debian: http://bugs.debian.org/709776
-Forwarded: no
----
- tests/dbus/debug-client.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tests/dbus/debug-client.c b/tests/dbus/debug-client.c
-index 50d07fa..a62d2b0 100644
---- a/tests/dbus/debug-client.c
-+++ b/tests/dbus/debug-client.c
-@@ -228,12 +228,17 @@ test_get_messages (Test *test,
-   msg = g_ptr_array_index (test->messages, 0);
-   g_assert (TP_IS_DEBUG_MESSAGE (msg));
- 
-+#ifdef __sparc__
-+  g_message ("FIXME: GDateTime doesn't seem to work on sparc");
-+  g_message ("Debian #706776, #709781");
-+#else
-   t = tp_debug_message_get_time (msg);
-   g_assert (t != NULL);
-   /* Don't use g_date_time_equal() as the gouble -> GDateTime conversion in
-    * _tp_debug_message_new() may result in a difference of one (!)
-    * millisecond */
-   g_assert_cmpuint (g_date_time_to_unix (t), ==, g_date_time_to_unix (time1));
-+#endif
- 
-   g_assert_cmpstr (tp_debug_message_get_domain (msg), ==, "domain1");
-   g_assert (tp_debug_message_get_category (msg) == NULL);
-@@ -244,9 +249,11 @@ test_get_messages (Test *test,
-   msg = g_ptr_array_index (test->messages, 1);
-   g_assert (TP_IS_DEBUG_MESSAGE (msg));
- 
-+#ifndef __sparc__
-   t = tp_debug_message_get_time (msg);
-   g_assert (t != NULL);
-   g_assert_cmpuint (g_date_time_to_unix (t), ==, g_date_time_to_unix (time2));
-+#endif
- 
-   g_assert_cmpstr (tp_debug_message_get_domain (msg), ==, "domain2");
-   g_assert_cmpstr (tp_debug_message_get_category (msg), ==, "category");
diff --git a/debian/patches/series b/debian/patches/series
index 7def590..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Do-not-assert-about-debug-messages-dates-times-on-sp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git