Update the master branch to version 0.13.99

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15492df83912840e087a523e372b25632ddaaca5..36b61a5b599ad3b714b8ad3e9d1d2b1df0513435 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 2.8.7)
 cmake_policy(SET CMP0048 NEW)
-project(json-c VERSION 0.12.99)
+project(json-c VERSION 0.13.99)
 
 
 include(CheckSymbolExists)

diff --git a/ChangeLog b/ChangeLog
index e0793377f6a04461c885195013e462bd452d6697..75357c179ab2855415629bda675241328441d626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 
+Next version, 0.14
+==================
+
+Nothing yet.
+
+
 0.13 (up to commit 5dae561, 2017/11/29)
 =================================
 

diff --git a/Doxyfile b/Doxyfile
index 31e902585ab0110208074be6ff44c53b864dfa95..a74032d1f49a0a5a14b1d4091b959be580f42869 100644 (file)
--- 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.12.99
+PROJECT_NUMBER         = 0.13.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/Makefile.am b/Makefile.am
index 435ed7e9f40ab207c1327a07983b3b63111f2eb7..7e42185dd402a2cb0de67c760888991ad1c6dece 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ noinst_HEADERS=\
        random_seed.h \
        strerror_override.h
 
-libjson_c_la_LDFLAGS = -version-info 3:0:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@
+libjson_c_la_LDFLAGS = -version-info 3:1:0 -no-undefined @JSON_BSYMBOLIC_LDFLAGS@
 
 libjson_c_la_SOURCES = \
        arraylist.c \

diff --git a/config.h.win32 b/config.h.win32
index 3e8b2182ff41b60fe1ea18f7919211768daa48b7..0e14c7adb17e73ce21dfb48916f4eddb990a9b91 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -175,7 +175,7 @@
 #define PACKAGE_NAME "JSON C Library"\r
 \r
 /* Define to the full name and version of this package. */\r
-#define PACKAGE_STRING "JSON C Library 0.12.99"\r
+#define PACKAGE_STRING "JSON C Library 0.13.99"\r
 \r
 /* Define to the one symbol short name of this package. */\r
 #define PACKAGE_TARNAME "json-c"\r
@@ -184,13 +184,13 @@
 #define PACKAGE_URL "https://github.com/json-c/json-c"\r
 \r
 /* Define to the version of this package. */\r
-#define PACKAGE_VERSION "0.12.99"\r
+#define PACKAGE_VERSION "0.13.99"\r
 \r
 /* Define to 1 if you have the ANSI C header files. */\r
 #define STDC_HEADERS 1\r
 \r
 /* Version number of package */\r
-#define VERSION "0.12.99"\r
+#define VERSION "0.13.99"\r
 \r
 /* Define to empty if `const' does not conform to ANSI C. */\r
 /* #undef const */\r

diff --git a/configure.ac b/configure.ac
index d29a387d138a3755a2b9537de5f5a1d5b7036050..ef556ebc89b78de4a30b21da611e61be8d9b795d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.64)
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT([json-c], 0.12.99, [json-c@googlegroups.com])
+AC_INIT([json-c], 0.13.99, [json-c@googlegroups.com])
 
 AM_INIT_AUTOMAKE
 

diff --git a/json_c_version.h b/json_c_version.h
index 442174f6eb07f6b9dc06de957e3a3443c07b8e07..a623f384802d187f70df14ad3de6e9cb86a290fa 100644 (file)
--- a/json_c_version.h
+++ b/json_c_version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Eric Haszlakiewicz
+ * Copyright (c) 2012,2017 Eric Haszlakiewicz
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See COPYING for details.
@@ -13,12 +13,12 @@
 #define _json_c_version_h_
 
 #define JSON_C_MAJOR_VERSION 0
-#define JSON_C_MINOR_VERSION 12
+#define JSON_C_MINOR_VERSION 13
 #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.12.99"
+#define JSON_C_VERSION "0.13.99"
 
 /**
  * @see JSON_C_VERSION