From fcc768e6679076ef90ea263569a36ca29a85a544 Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sun, 23 Dec 2012 11:09:20 -0600 Subject: [PATCH] Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch. --- Doxyfile | 2 +- Makefile.am | 2 +- RELEASE_CHECKLIST.txt | 1 + configure.in | 2 +- json_c_version.h | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Doxyfile b/Doxyfile index 3ff27eb..91c9434 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.10 +PROJECT_NUMBER = 0.10.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/Makefile.am b/Makefile.am index 147d957..51159b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,7 +67,7 @@ maintainer-clean-local: if ENABLE_OLDNAME_COMPAT install-data-hook: - test \! -e "$(DESTDIR)@includedir@json" || rm "$(DESTDIR)@includedir@/json" + test \! -e "$(DESTDIR)@includedir@/json" || rm "$(DESTDIR)@includedir@/json" $(LN_S) json-c "$(DESTDIR)@includedir@/json" uninstall-local: diff --git a/RELEASE_CHECKLIST.txt b/RELEASE_CHECKLIST.txt index d086592..bdc547a 100644 --- a/RELEASE_CHECKLIST.txt +++ b/RELEASE_CHECKLIST.txt @@ -53,6 +53,7 @@ Post-release checklist: git branch master Add new section to CHANGES +Update the version in json_c_version.h Update the version in Doxyfile Update the version in configure.in Update the libjson_la_LDFLAGS line in Makefile.am to the new version. diff --git a/configure.in b/configure.in index 387b422..5a3c0df 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_PREREQ(2.52) # Process this file with autoconf to produce a configure script. -AC_INIT([json-c], 0.10, [json-c@googlegroups.com]) +AC_INIT([json-c], 0.10.99, [json-c@googlegroups.com]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff --git a/json_c_version.h b/json_c_version.h index 3e35aff..72bbbae 100644 --- a/json_c_version.h +++ b/json_c_version.h @@ -10,11 +10,11 @@ #define JSON_C_MAJOR_VERSION 0 #define JSON_C_MINOR_VERSION 10 -#define JSON_C_MICRO_VERSION 0 +#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.10" +#define JSON_C_VERSION "0.10.99" const char *json_c_version(void); /* Returns JSON_C_VERSION */ int json_c_version_num(void); /* Returns JSON_C_VERSION_NUM */ -- 2.7.4