r46223 - in /desktop/unstable/json-glib/debian: changelog patches/0001-tests-builder-Don-t-duplicate-test-names.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Fri Oct  2 11:16:04 2015
New Revision: 46223

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46223
Log:
debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch:
Cherry-pick. Don't duplicate test names, so as not to fail to build with
glib 2.46.

Added:
    desktop/unstable/json-glib/debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch
Modified:
    desktop/unstable/json-glib/debian/changelog

Modified: desktop/unstable/json-glib/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/json-glib/debian/changelog?rev=46223&op=diff
==============================================================================
--- desktop/unstable/json-glib/debian/changelog	[utf-8] (original)
+++ desktop/unstable/json-glib/debian/changelog	[utf-8] Fri Oct  2 11:16:04 2015
@@ -1,6 +1,12 @@
 json-glib (1.0.4-2) UNRELEASED; urgency=medium
 
+  [ Michael Biebl ]
   * Drop obsolete Conflicts/Replaces.
+
+  [ Iain Lane ]
+  * debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch:
+    Cherry-pick. Don't duplicate test names, so as not to fail to build with
+    glib 2.46.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 23 May 2015 16:01:05 +0200
 

Added: desktop/unstable/json-glib/debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/json-glib/debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch?rev=46223&op=file
==============================================================================
--- desktop/unstable/json-glib/debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch	(added)
+++ desktop/unstable/json-glib/debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch	[utf-8] Fri Oct  2 11:16:04 2015
@@ -0,0 +1,28 @@
+From 5185a8f8a58e5b455116eaa8c99c4b4c38a45929 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Fri, 2 Oct 2015 11:28:38 +0100
+Subject: [PATCH] tests/builder: Don't duplicate test names
+
+GLib 2.46.0 forbids this and so the testsuite fails.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755977
+---
+ json-glib/tests/builder.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/json-glib/tests/builder.c b/json-glib/tests/builder.c
+index 0183381..eaabb0d 100644
+--- a/json-glib/tests/builder.c
++++ b/json-glib/tests/builder.c
+@@ -160,7 +160,7 @@ main (int   argc,
+   g_test_init (&argc, &argv, NULL);
+ 
+   g_test_add_func ("/builder/complex", test_builder_complex);
+-  g_test_add_func ("/builder/complex", test_builder_empty);
++  g_test_add_func ("/builder/empty", test_builder_empty);
+   g_test_add_func ("/builder/reset", test_builder_reset);
+ 
+   return g_test_run ();
+-- 
+2.5.0
+