jansson 2.3.1

diff --git a/CHANGES b/CHANGES
index f044f74..2a36b4f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,28 @@
+Version 2.3.1
+=============
+
+Released 2012-04-20
+
+* Build issues:
+
+  - Only use ``long long`` if ``strtoll()`` is also available.
+
+* Documentation:
+
+  - Fix the names of library version constants in documentation. (#52)
+
+  - Change the tutorial to use GitHub API v3. (#65)
+
+* Tests:
+
+  - Make some tests locale independent. (#51)
+
+  - Distribute the library exports test in the tarball.
+
+  - Make test run on shells that don't support the ``export FOO=bar``
+    syntax.
+
+
 Version 2.3
 ===========
 

diff --git a/configure.ac b/configure.ac
index 70b0fed..677dbef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.3], [petri@digip.org])
+AC_INIT([jansson], [2.3.1], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

diff --git a/doc/conf.py b/doc/conf.py
index fbbf65b..701fd46 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,7 +48,7 @@ copyright = u'2009-2012, Petri Lehtinen'
 # built documents.
 #
 # The short X.Y version.
-version = '2.3'
+version = '2.3.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 80c03de..22bc053 100644 (file)
--- 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 7:0:3
+       -version-info 7:1:3
 
 if GCC
 # These flags are gcc specific

diff --git a/src/jansson.h b/src/jansson.h
index 68a367c..cae2432 100644 (file)
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -22,10 +22,10 @@ extern "C" {
 
 #define JANSSON_MAJOR_VERSION  2
 #define JANSSON_MINOR_VERSION  3
-#define JANSSON_MICRO_VERSION  0
+#define JANSSON_MICRO_VERSION  1
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.3"
+#define JANSSON_VERSION  "2.3.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 >= ... */