From f227483846e6febf7f43398d8cfa27cffc79e4b4 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Fri, 27 Jan 2012 21:02:12 +0200
Subject: [PATCH] jansson 2.3

---
 CHANGES         | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac    |  2 +-
 doc/conf.py     |  2 +-
 src/Makefile.am |  2 +-
 src/jansson.h   |  6 +++---
 5 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7720533..f044f74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,51 @@
+Version 2.3
+===========
+
+Released 2012-01-27
+
+* New features:
+
+  - `json_unpack()` and friends: Add support for optional object keys
+    with the ``{s?o}`` syntax.
+
+  - Add `json_object_update_existing()` and
+    `json_object_update_missing()`, for updating only existing keys or
+    only adding missing keys to an object. (#37)
+
+  - Add `json_object_foreach()` for more convenient iteration over
+    objects. (#45, #46)
+
+  - When decoding JSON, write the number of bytes that were read from
+    input to ``error.position`` also on success. This is handy with
+    ``JSON_DISABLE_EOF_CHECK``.
+
+  - Add support for decoding any JSON value, not just arrays or
+    objects. The support is enabled with the new ``JSON_DECODE_ANY``
+    flag. Patch by Andrea Marchesini. (#4)
+
+* Bug fixes
+
+  - Avoid problems with object's serial number growing too big. (#40,
+    #41)
+
+  - Decoding functions now return NULL if the first argument is NULL.
+    Patch by Andrea Marchesini.
+
+  - Include ``jansson_config.h.win32`` in the distribution tarball.
+
+  - Remove ``+`` and leading zeros from exponents in the encoder.
+    (#39)
+
+  - Make Jansson build and work on MinGW. (#39, #38)
+
+* Documentation
+
+  - Note that the same JSON values must not be encoded in parallel by
+    separate threads. (#42)
+
+  - Document MinGW support.
+
+
 Version 2.2.1
 =============
 
diff --git a/configure.ac b/configure.ac
index 7ceac2f..662f41a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.2.1], [petri@digip.org])
+AC_INIT([jansson], [2.3], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 
diff --git a/doc/conf.py b/doc/conf.py
index d12eff6..784d1bb 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,7 +48,7 @@ copyright = u'2009-2011, Petri Lehtinen'
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.1'
+version = '2.3'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 190bef7..80c03de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ libjansson_la_SOURCES = \
 	value.c
 libjansson_la_LDFLAGS = \
 	-export-symbols-regex '^json_' \
-	-version-info 6:1:2
+	-version-info 7:0:3
 
 if GCC
 # These flags are gcc specific
diff --git a/src/jansson.h b/src/jansson.h
index 55c618d..e1a00f0 100644
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  2
-#define JANSSON_MICRO_VERSION  1
+#define JANSSON_MINOR_VERSION  3
+#define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.2.1"
+#define JANSSON_VERSION  "2.3"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
-- 
2.1.4