Merge lp:~rodrigo-moya/ubuntu/maverick/json-glib/fix-756426 into lp:ubuntu/maverick/json-glib

[Rodrigo Moya]

[Michael Vogt (mvo)]

thanks uploaded

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-10 19:30:56 +0000
+++ debian/changelog	2011-04-13 11:41:06 +0000
@@ -1,3 +1,10 @@
+json-glib (0.10.2-2ubuntu3) maverick-proposed; urgency=low
+
+  * debian/patches/01_use_g_format_for_g_ascii_formatd.patch:
+    - Add upstream patch to fix serialization of doubles (LP: #756426)
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 13 Apr 2011 13:10:57 +0200
+
 json-glib (0.10.2-2ubuntu2) maverick; urgency=low
 
   * Rebuild for the new gobject introspection

=== added directory 'debian/patches'
=== added file 'debian/patches/01_use_g_format_for_g_ascii_formatd.patch'
--- debian/patches/01_use_g_format_for_g_ascii_formatd.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_use_g_format_for_g_ascii_formatd.patch	2011-04-13 11:41:06 +0000
@@ -0,0 +1,29 @@
+From f622ee8d8ba54ddea6fbb7311a905ffab7842e8d Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <[e-mail]>
+Date: Thu, 18 Mar 2010 17:05:57 +0000
+Subject: generator: Use %g format for g_ascii_formatd()
+
+I should read the documentation for the functions I use:
+
+  Converts a gdouble to a string, using the '.' as decimal point. To
+  format the number you pass in a printf()-style format string. Allowed
+  conversion specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'.
+                -- from g_ascii_formatd() in GLib's API reference
+
+Epic reading fail.
+---
+diff --git a/json-glib/json-generator.c b/json-glib/json-generator.c
+index bad239b..c77830e 100644
+--- a/json-glib/json-generator.c
++++ b/json-glib/json-generator.c
+@@ -309,7 +309,7 @@ dump_value (JsonGenerator *generator,
+       {
+         gchar buf[65];
+ 
+-        g_ascii_formatd (buf, 65, "%d", g_value_get_double (&value));
++        g_ascii_formatd (buf, 65, "%g", g_value_get_double (&value));
+         g_string_append (buffer, buf);
+       }
+       break;
+--
+cgit v0.9

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-04-13 11:41:06 +0000
@@ -0,0 +1,1 @@
+01_use_g_format_for_g_ascii_formatd.patch