@@ -1,4 +1,8 @@ | |||||
NEXT.VERSION | |||||
...nothing yet... | |||||
0.12 | 0.12 | ||||
* Address security issues: | * Address security issues: | ||||
@@ -23,7 +23,7 @@ PROJECT_NAME = json-c | |||||
# This could be handy for archiving the generated documentation or | # This could be handy for archiving the generated documentation or | ||||
# if some version control system is used. | # 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) | # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) | ||||
# base path where the generated documentation will be put. | # base path where the generated documentation will be put. | ||||
@@ -18,7 +18,7 @@ Make any fixes/changes *before* branching. | |||||
Update the version in json_c_version.h | Update the version in json_c_version.h | ||||
Update the version in Doxyfile | Update the version in Doxyfile | ||||
Update the version in configure.in | |||||
Update the version in configure.ac | |||||
Use ${release}. | Use ${release}. | ||||
Update the libjson_la_LDFLAGS line in Makefile.am to the new version. | 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 | Add new section to ChangeLog | ||||
Update the version in json_c_version.h | Update the version in json_c_version.h | ||||
Update the version in Doxyfile | 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. | Use ${release}.99 to indicate a version "newer" than anything on the branch. | ||||
Leave the libjson_la_LDFLAGS line in Makefile.am alone. | Leave the libjson_la_LDFLAGS line in Makefile.am alone. | ||||
@@ -1,7 +1,7 @@ | |||||
AC_PREREQ(2.52) | AC_PREREQ(2.52) | ||||
# Process this file with autoconf to produce a configure script. | # 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 | AM_INIT_AUTOMAKE | ||||
@@ -9,12 +9,12 @@ | |||||
#define _json_c_version_h_ | #define _json_c_version_h_ | ||||
#define JSON_C_MAJOR_VERSION 0 | #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_MICRO_VERSION 99 | ||||
#define JSON_C_VERSION_NUM ((JSON_C_MAJOR_VERSION << 16) | \ | #define JSON_C_VERSION_NUM ((JSON_C_MAJOR_VERSION << 16) | \ | ||||
(JSON_C_MINOR_VERSION << 8) | \ | (JSON_C_MINOR_VERSION << 8) | \ | ||||
JSON_C_MICRO_VERSION) | 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 */ | const char *json_c_version(void); /* Returns JSON_C_VERSION */ | ||||
int json_c_version_num(void); /* Returns JSON_C_VERSION_NUM */ | int json_c_version_num(void); /* Returns JSON_C_VERSION_NUM */ | ||||