jansson 2.7

akheron · Oct 2, 2014 · ee27b7e · ee27b7e
1 parent 391d910
commit ee27b7e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,10 +78,10 @@ endif (WIN32)
 # set (JANSSON_VERSION "2.3.1")
 # set (JANSSON_SOVERSION 2)
 
-set(JANSSON_DISPLAY_VERSION "2.6")
+set(JANSSON_DISPLAY_VERSION "2.7")
 
 # This is what is required to match the same numbers as automake's
-set(JANSSON_VERSION "4.6.0")
+set(JANSSON_VERSION "4.7.0")
 set(JANSSON_SOVERSION 4)
 
 # for CheckFunctionKeywords

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.6], [petri@digip.org])
+AC_INIT([jansson], [2.7], [petri@digip.org])
 
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([1.10 foreign])

diff --git a/doc/apiref.rst b/doc/apiref.rst
@@ -1313,7 +1313,7 @@ type whose address should be passed.
     :func:`json_string_value()` internally, so it exists as long as
     there are still references to the corresponding JSON string.
 
-``s%`` (string) [const char \*, size_t *]
+``s%`` (string) [const char \*, size_t \*]
     Convert a JSON string to a pointer to a NULL terminated UTF-8
     string and its length.
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.6'
+version = '2.7'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -23,4 +23,4 @@ libjansson_la_SOURCES = \
 libjansson_la_LDFLAGS = \
 	-no-undefined \
 	-export-symbols-regex '^json_' \
-	-version-info 10:0:6
+	-version-info 11:0:7
diff --git a/src/jansson.h b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  6
+#define JANSSON_MINOR_VERSION  7
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.6"
+#define JANSSON_VERSION  "2.7"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */