From 86d17a8dc21ab9bc5775e1611bc90c64e2bbf22c Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Fri, 10 Jun 2011 21:30:11 +0300 Subject: [PATCH] jansson 2.1 --- configure.ac | 2 +- doc/conf.py | 4 ++-- src/Makefile.am | 2 +- src/jansson.h | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index c056f6c..da04bf8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.0.1+git], [petri@digip.org]) +AC_INIT([jansson], [2.1], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/conf.py b/doc/conf.py index 7e311b0..ff3ba2e 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.0' +version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.0.1+git' +release = '2.1' # 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 8a74868..eac5239 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 4:1:0 + -version-info 5:0:1 if GCC # These flags are gcc specific diff --git a/src/jansson.h b/src/jansson.h index 79f7ed5..3abb4cf 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 0 -#define JANSSON_MICRO_VERSION 255 +#define JANSSON_MINOR_VERSION 1 +#define JANSSON_MICRO_VERSION 0 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "2.0.1+git" +#define JANSSON_VERSION "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