From cf9b384bcbd2fab0bfb44e0165368d3abc965f32 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Mon, 28 Feb 2011 20:46:14 +0200 Subject: [PATCH] jansson 2.0 --- CHANGES | 6 ++++-- configure.ac | 2 +- doc/conf.py | 2 +- src/Makefile.am | 2 +- src/jansson.h | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index cf4f5a3..d68018b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -Version 2.0 (in development) -============================ +Version 2.0 +=========== + +Released 2011-02-28 This release is backwards incompatible with the 1.x release series. See the chapter "Upgrading from older versions" in documentation for diff --git a/configure.ac b/configure.ac index cabc732..6ff975e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.0pre], [petri@digip.org]) +AC_INIT([jansson], [2.0], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/conf.py b/doc/conf.py index 465d4fe..c8911ab 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -50,7 +50,7 @@ copyright = u'2009-2011, Petri Lehtinen' # The short X.Y version. version = '2.0' # The full version, including alpha/beta/rc tags. -release = '2.0pre' +release = '2.0' # 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 f14bbaa..ec9b099 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 3:0:3 + -version-info 4:0:0 if GCC # These flags are gcc specific diff --git a/src/jansson.h b/src/jansson.h index 8306e21..86399fd 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -20,12 +20,12 @@ extern "C" { /* version */ -#define JANSSON_MAJOR_VERSION 1 -#define JANSSON_MINOR_VERSION 3 +#define JANSSON_MAJOR_VERSION 2 +#define JANSSON_MINOR_VERSION 0 #define JANSSON_MICRO_VERSION 0 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "1.3" +#define JANSSON_VERSION "2.0" /* 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