Update the master branch to version 16.99

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b7eda253bd4bc8424ed0e9c370cd091c55729a..45138c111c6c3fb684cdd2771494cfef9d148d02 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,11 +10,11 @@ endif()
 if (CMAKE_VERSION VERSION_LESS 3.0)
        project(json-c)
        set(PROJECT_VERSION_MAJOR "0")
-       set(PROJECT_VERSION_MINOR "15")
+       set(PROJECT_VERSION_MINOR "16")
        set(PROJECT_VERSION_PATCH "99")
        set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 else()
-       project(json-c LANGUAGES C VERSION 0.15.99)
+       project(json-c LANGUAGES C VERSION 0.16.99)
 endif()
 
 # If we've got 3.0 then it's good, let's provide support. Otherwise, leave it be.
@@ -454,7 +454,7 @@ add_library(${PROJECT_NAME}
     ${JSON_C_HEADERS}
 )
 set_target_properties(${PROJECT_NAME} PROPERTIES
-    VERSION 5.1.0
+    VERSION 5.2.0
     SOVERSION 5)
 list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
 # If json-c is used as subroject it set to target correct interface -I flags and allow

diff --git a/json-c.sym b/json-c.sym
index 2dedc6eef1d687b4debea12cfbc1074415844c26..1942acd53968f702f1581a04061cf1810be05678 100644 (file)
--- a/json-c.sym
+++ b/json-c.sym
@@ -168,3 +168,8 @@ JSONC_0.16 {
 #  global:
 #      ...new symbols here...
 } JSONC_0.15;
+
+JSONC_0.17 {
+#  global:
+#      ...new symbols here...
+} JSONC_0.16;

diff --git a/json_c_version.h b/json_c_version.h
index d15ad64cb5934b19d9a24f995fcbef5c24fe1843..f0e8d67bd5b5c8dd160263a6214769abc1de40e7 100644 (file)
--- a/json_c_version.h
+++ b/json_c_version.h
@@ -17,11 +17,11 @@ extern "C" {
 #endif
 
 #define JSON_C_MAJOR_VERSION 0
-#define JSON_C_MINOR_VERSION 15
+#define JSON_C_MINOR_VERSION 16
 #define JSON_C_MICRO_VERSION 99
 #define JSON_C_VERSION_NUM \
        ((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION)
-#define JSON_C_VERSION "0.15.99"
+#define JSON_C_VERSION "0.16.99"
 
 #ifndef JSON_EXPORT
 #if defined(_MSC_VER) && defined(JSON_C_DLL)