diff --git a/ChangeLog b/ChangeLog index 451b8f6..584ed1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ +NEXT.VERSION + + ...nothing yet... + 0.12 * Address security issues: diff --git a/Doxyfile b/Doxyfile index cf52c48..da39aca 100644 --- a/Doxyfile +++ b/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = json-c # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.11.99 +PROJECT_NUMBER = 0.12.99 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/RELEASE_CHECKLIST.txt b/RELEASE_CHECKLIST.txt index 0bb2b77..e8702e6 100644 --- a/RELEASE_CHECKLIST.txt +++ b/RELEASE_CHECKLIST.txt @@ -18,7 +18,7 @@ Make any fixes/changes *before* branching. Update the version in json_c_version.h Update the version in Doxyfile -Update the version in configure.in +Update the version in configure.ac Use ${release}. Update the libjson_la_LDFLAGS line in Makefile.am to the new version. @@ -85,7 +85,7 @@ git checkout master Add new section to ChangeLog Update the version in json_c_version.h Update the version in Doxyfile -Update the version in configure.in +Update the version in configure.ac Use ${release}.99 to indicate a version "newer" than anything on the branch. Leave the libjson_la_LDFLAGS line in Makefile.am alone. diff --git a/configure.ac b/configure.ac index 48c8e5f..c50f81b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.52) # Process this file with autoconf to produce a configure script. -AC_INIT([json-c], 0.11.99, [json-c@googlegroups.com]) +AC_INIT([json-c], 0.12.99, [json-c@googlegroups.com]) AM_INIT_AUTOMAKE diff --git a/json_c_version.h b/json_c_version.h index 5d3db8f..d77f1a7 100644 --- a/json_c_version.h +++ b/json_c_version.h @@ -9,12 +9,12 @@ #define _json_c_version_h_ #define JSON_C_MAJOR_VERSION 0 -#define JSON_C_MINOR_VERSION 11 +#define JSON_C_MINOR_VERSION 12 #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.11.99" +#define JSON_C_VERSION "0.12.99" const char *json_c_version(void); /* Returns JSON_C_VERSION */ int json_c_version_num(void); /* Returns JSON_C_VERSION_NUM */