From 9c6cb42f17fa1fb95edf766e2b44b128d1ebd08e Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Thu, 6 Oct 2011 21:16:26 +0300
Subject: [PATCH] jansson 2.2.1

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

diff --git a/CHANGES b/CHANGES
index 11e9e7f..7720533 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,31 @@
+Version 2.2.1
+=============
+
+Released 2011-10-06
+
+* Bug fixes:
+
+  - Fix real number encoding and decoding under non-C locales. (#32)
+
+  - Fix identifier decoding under non-UTF-8 locales. (#35)
+
+  - `json_load_file()`: Open the input file in binary mode for maximum
+    compatiblity.
+
+* Documentation:
+
+  - Clarify the lifecycle of the result of the ``s`` fromat of
+    `json_unpack()`. (#31)
+
+  - Add some portability info. (#36)
+
+  - Little clarifications here and there.
+
+* Other:
+
+  - Some style fixes, issues detected by static analyzers.
+
+
 Version 2.2
 ===========
 
diff --git a/configure.ac b/configure.ac
index c138937..7ceac2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.2], [petri@digip.org])
+AC_INIT([jansson], [2.2.1], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 
diff --git a/doc/conf.py b/doc/conf.py
index 3799eda..d12eff6 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.2'
+version = '2.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.2'
+release = version
 
 # 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 c79502f..72b993c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ libjansson_la_SOURCES = \
 	value.c
 libjansson_la_LDFLAGS = \
 	-export-symbols-regex '^json_' \
-	-version-info 6:0:2
+	-version-info 6:1:2
 
 if GCC
 # These flags are gcc specific
diff --git a/src/jansson.h b/src/jansson.h
index 7fe0c0d..55c03d7 100644
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -22,10 +22,10 @@ extern "C" {
 
 #define JANSSON_MAJOR_VERSION  2
 #define JANSSON_MINOR_VERSION  2
-#define JANSSON_MICRO_VERSION  0
+#define JANSSON_MICRO_VERSION  1
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.2"
+#define JANSSON_VERSION  "2.2.1"
 
 /* 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