From 889f2959581f6aba4ed7b1afa1bc7961c3c78c43 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Fri, 2 Sep 2011 21:39:32 +0300
Subject: [PATCH] jansson 2.2

---
 CHANGES         | 22 +++++++++++++++++++++-
 configure.ac    |  2 +-
 doc/conf.py     |  4 ++--
 src/Makefile.am |  2 +-
 src/jansson.h   |  4 ++--
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 705f3b9..11e9e7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,27 @@
+Version 2.2
+===========
+
+Released 2011-09-03
+
+* New features:
+
+  - `json_dump_callback()`: Pass the encoder output to a callback
+    function in chunks.
+
+* Bug fixes:
+
+  - `json_string_set()`: Check that target is a string and value is
+    not NULL.
+
+* Other:
+
+  - Documentation typo fixes and clarifications.
+
+
 Version 2.1
 ===========
 
-Release 2011-06-10
+Released 2011-06-10
 
 * New features:
 
diff --git a/configure.ac b/configure.ac
index da04bf8..64e22d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.1], [petri@digip.org])
+AC_INIT([jansson], [2.2], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 
diff --git a/doc/conf.py b/doc/conf.py
index ff3ba2e..3799eda 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,9 +48,9 @@ copyright = u'2009-2011, Petri Lehtinen'
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.1'
+release = '2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/src/Makefile.am b/src/Makefile.am
index eac5239..7da78b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ libjansson_la_SOURCES = \
 	value.c
 libjansson_la_LDFLAGS = \
 	-export-symbols-regex '^json_' \
-	-version-info 5:0:1
+	-version-info 6:0:2
 
 if GCC
 # These flags are gcc specific
diff --git a/src/jansson.h b/src/jansson.h
index 8275e4f..7fe0c0d 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  1
+#define JANSSON_MINOR_VERSION  2
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.1"
+#define JANSSON_VERSION  "2.2"
 
 /* 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