From: Eric Haszlakiewicz Date: Sun, 19 Apr 2020 03:57:08 +0000 (+0000) Subject: Update the master branch to version 0.0.14.99 X-Git-Tag: json-c-0.15-20200726~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2babb5b78096b55afda4beda081e5788d22e349a;p=json-c Update the master branch to version 0.0.14.99 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 60b50fc..e156e56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if(POLICY CMP0048) endif() # JSON-C library is C only project. -project(json-c LANGUAGES C VERSION 0.13.99) +project(json-c LANGUAGES C VERSION 0.14.99) # If we've got 3.0 then it's good, let's provide support. Otherwise, leave it be. if(POLICY CMP0038) @@ -381,8 +381,8 @@ add_library(${PROJECT_NAME} ${JSON_C_HEADERS} ) set_target_properties(${PROJECT_NAME} PROPERTIES - VERSION 4.0.0 - SOVERSION 4) + VERSION 5.0.0 + SOVERSION 5) # If json-c is used as subroject it set to target correct interface -I flags and allow # to build external target without extra include_directories(...) diff --git a/ChangeLog b/ChangeLog index 7f670ea..fe57a92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,16 @@ +Next Release 0.15 +===================== + +Deprecated and removed features: +-------------------------------- +...none yet... + +Other changes +-------------- +...none yet... + +*** 0.14 (up to commit 9ed00a6, 2020/04/14) ========================================= diff --git a/Doxyfile b/Doxyfile index a13c3ab..06d54e6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = json-c # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.13.99 +PROJECT_NUMBER = 0.14.99 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/RELEASE_CHECKLIST.txt b/RELEASE_CHECKLIST.txt index 09ebb1c..32e38a3 100644 --- a/RELEASE_CHECKLIST.txt +++ b/RELEASE_CHECKLIST.txt @@ -31,7 +31,7 @@ ## Release creation Start creating the new release: - release=0.14 + release=0.15 git clone https://github.com/json-c/json-c json-c-${release} mkdir distcheck diff --git a/config.h.win32 b/config.h.win32 index 66c5a57..130378e 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -177,7 +177,7 @@ #define PACKAGE_NAME "JSON C Library" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "JSON C Library 0.13.99" +#define PACKAGE_STRING "JSON C Library 0.14.99" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "json-c" @@ -186,13 +186,13 @@ #define PACKAGE_URL "https://github.com/json-c/json-c" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.13.99" +#define PACKAGE_VERSION "0.14.99" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.13.99" +#define VERSION "0.14.99" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/json_c_version.h b/json_c_version.h index 056b292..c0385c4 100644 --- a/json_c_version.h +++ b/json_c_version.h @@ -13,11 +13,11 @@ #define _json_c_version_h_ #define JSON_C_MAJOR_VERSION 0 -#define JSON_C_MINOR_VERSION 13 +#define JSON_C_MINOR_VERSION 14 #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.13.99" +#define JSON_C_VERSION "0.14.99" #ifndef JSON_EXPORT #if defined(_MSC_VER)