diff options
| author | Petri Lehtinen <petri@digip.org> | 2012-09-22 19:22:34 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2012-09-23 12:52:41 +0300 |
| commit | 3279aacdeed2aac96741c02e2ddecbb5ae087ff8 (patch) | |
| tree | c39ef1d4c61e2801defe1901f821956b97b0a4b7 | |
| parent | 21586701773110cccf285366aac1750c44412047 (diff) | |
| download | jansson-2.4.zip jansson-2.4.tar.gz jansson-2.4.tar.bz2 | |
jansson 2.4v2.4
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jansson.h | 6 |
5 files changed, 9 insertions, 9 deletions
@@ -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 --- 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 --- 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 --- 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 --- 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 >= ... */ |