jansson 2.4

diff --git a/CHANGES b/CHANGES
index 83bf5e0..4c7cccc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
-Version 2.4 (in development)
-============================
+Version 2.4
+===========
 
-Released 2012-XX-XX
+Released 2012-09-23
 
 * New features:
 

diff --git a/configure.ac b/configure.ac
index 753a09b..3b595a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.4-dev], [petri@digip.org])
+AC_INIT([jansson], [2.4], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

diff --git a/doc/conf.py b/doc/conf.py
index 35c5238..6010904 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -50,7 +50,7 @@ copyright = u'2009-2012, Petri Lehtinen'
 # The short X.Y version.
 version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.4-dev'
+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 1bb9f62..9d040f6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ libjansson_la_SOURCES = \
 libjansson_la_LDFLAGS = \
        -no-undefined \
        -export-symbols-regex '^json_' \
-       -version-info 7:1:3
+       -version-info 8:0:4
 
 if GCC
 # These flags are gcc specific

diff --git a/src/jansson.h b/src/jansson.h
index 1f1cc14..352c6ce 100644 (file)
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  3
-#define JANSSON_MICRO_VERSION  99
+#define JANSSON_MINOR_VERSION  4
+#define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.4-dev"
+#define JANSSON_VERSION  "2.4"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */