Commit d611f1b3 authored by Andreas Henriksson's avatar Andreas Henriksson

* New upstream release.

* Bump Standards-Version to 3.9.7
* Drop debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch
  - merged upstream.
* Updated debian/libjson-glib-1.0-0.symbols with many additions.
parent c775f9f2
json-glib (1.2.0-1) unstable; urgency=medium
* New upstream release.
* Bump Standards-Version to 3.9.7
* Drop debian/patches/0001-tests-builder-Don-t-duplicate-test-names.patch
- merged upstream.
* Updated debian/libjson-glib-1.0-0.symbols with many additions.
-- Andreas Henriksson <andreas@fatal.se> Thu, 24 Mar 2016 16:26:57 +0100
json-glib (1.0.4-2) unstable; urgency=medium
[ Michael Biebl ]
......
......@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9),
gobject-introspection (>= 0.9.12-4~),
xsltproc,
libxml2-utils
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Homepage: https://wiki.gnome.org/Projects/JsonGlib
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/json-glib
Vcs-Browser: https://anonscm.debian.org/viewpkg-gnome/desktop/unstable/json-glib
......
......@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9),
gobject-introspection (>= 0.9.12-4~),
xsltproc,
libxml2-utils
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Homepage: https://wiki.gnome.org/Projects/JsonGlib
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/json-glib
Vcs-Browser: https://anonscm.debian.org/viewpkg-gnome/desktop/unstable/json-glib
......
......@@ -8,6 +8,7 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_array_add_object_element@Base 0.12.0
json_array_add_string_element@Base 0.12.0
json_array_dup_element@Base 0.12.0
json_array_equal@Base 1.2.0
json_array_foreach_element@Base 0.12.0
json_array_get_array_element@Base 0.12.0
json_array_get_boolean_element@Base 0.12.0
......@@ -20,9 +21,12 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_array_get_object_element@Base 0.12.0
json_array_get_string_element@Base 0.12.0
json_array_get_type@Base 0.12.0
json_array_hash@Base 1.2.0
json_array_is_immutable@Base 1.2.0
json_array_new@Base 0.12.0
json_array_ref@Base 0.12.0
json_array_remove_element@Base 0.12.0
json_array_seal@Base 1.2.0
json_array_sized_new@Base 0.12.0
json_array_unref@Base 0.12.0
json_boxed_can_deserialize@Base 0.12.0
......@@ -44,10 +48,12 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_builder_get_root@Base 0.12.0
json_builder_get_type@Base 0.12.0
json_builder_new@Base 0.12.0
json_builder_new_immutable@Base 1.2.0
json_builder_reset@Base 0.12.0
json_builder_set_member_name@Base 0.12.0
json_construct_gobject@Base 0.12.0
json_deserialize_pspec@Base 0.12.0
json_from_string@Base 1.2.0
json_generator_get_indent@Base 0.13.2
json_generator_get_indent_char@Base 0.13.2
json_generator_get_pretty@Base 0.13.2
......@@ -76,6 +82,7 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_node_dup_array@Base 0.12.0
json_node_dup_object@Base 0.12.0
json_node_dup_string@Base 0.12.0
json_node_equal@Base 1.2.0
json_node_free@Base 0.12.0
json_node_get_array@Base 0.12.0
json_node_get_boolean@Base 0.12.0
......@@ -88,6 +95,7 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_node_get_type@Base 0.12.0
json_node_get_value@Base 0.12.0
json_node_get_value_type@Base 0.12.0
json_node_hash@Base 1.2.0
json_node_init@Base 0.16.0
json_node_init_array@Base 0.16.0
json_node_init_boolean@Base 0.16.0
......@@ -96,8 +104,11 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_node_init_null@Base 0.16.0
json_node_init_object@Base 0.16.0
json_node_init_string@Base 0.16.0
json_node_is_immutable@Base 1.2.0
json_node_is_null@Base 0.12.0
json_node_new@Base 0.12.0
json_node_ref@Base 1.2.0
json_node_seal@Base 1.2.0
json_node_set_array@Base 0.12.0
json_node_set_boolean@Base 0.12.0
json_node_set_double@Base 0.12.0
......@@ -110,8 +121,10 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_node_take_object@Base 0.12.0
json_node_type_get_type@Base 0.12.0
json_node_type_name@Base 0.12.0
json_node_unref@Base 1.2.0
json_object_add_member@Base 0.12.0
json_object_dup_member@Base 0.12.0
json_object_equal@Base 1.2.0
json_object_foreach_member@Base 0.12.0
json_object_get_array_member@Base 0.12.0
json_object_get_boolean_member@Base 0.12.0
......@@ -126,9 +139,14 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_object_get_type@Base 0.12.0
json_object_get_values@Base 0.12.0
json_object_has_member@Base 0.12.0
json_object_hash@Base 1.2.0
json_object_is_immutable@Base 1.2.0
json_object_iter_init@Base 1.2.0
json_object_iter_next@Base 1.2.0
json_object_new@Base 0.12.0
json_object_ref@Base 0.12.0
json_object_remove_member@Base 0.12.0
json_object_seal@Base 1.2.0
json_object_set_array_member@Base 0.12.0
json_object_set_boolean_member@Base 0.12.0
json_object_set_double_member@Base 0.12.0
......@@ -151,6 +169,7 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_parser_load_from_stream_async@Base 0.12.0
json_parser_load_from_stream_finish@Base 0.12.0
json_parser_new@Base 0.12.0
json_parser_new_immutable@Base 1.2.0
json_path_compile@Base 0.13.4
json_path_error_get_type@Base 0.13.4
json_path_error_quark@Base 0.13.4
......@@ -192,3 +211,7 @@ libjson-glib-1.0.so.0 libjson-glib-1.0-0 #MINVER#
json_serializable_set_property@Base 0.13.4
json_serialize_gobject@Base 0.12.0
json_serialize_pspec@Base 0.12.0
json_string_compare@Base 1.2.0
json_string_equal@Base 1.2.0
json_string_hash@Base 1.2.0
json_to_string@Base 1.2.0
From 5185a8f8a58e5b455116eaa8c99c4b4c38a45929 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@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
0001-tests-builder-Don-t-duplicate-test-names.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment