summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2017-12-09 14:59:48 -0500
committerEric Haszlakiewicz <erh+git@nimenees.com>2017-12-09 14:59:48 -0500
commit0631c37c7f51231787b0d5611c7712856820e95e (patch)
tree643ea221bfa715996935481af988c0ce4ecb36ec
parent8c4a9414753ca2825b3cb9ae4315520200d50491 (diff)
downloadjson-c-0631c37c7f51231787b0d5611c7712856820e95e.tar.gz
Update the master branch to version 0.13.99
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog6
-rw-r--r--Doxyfile2
-rw-r--r--Makefile.am2
-rw-r--r--config.h.win326
-rw-r--r--configure.ac2
-rw-r--r--json_c_version.h6
7 files changed, 16 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15492df..36b61a5 100644
--- 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 e079337..75357c1 100644
--- 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 31e9025..a74032d 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.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 435ed7e..7e42185 100644
--- 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 3e8b218..0e14c7a 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -175,7 +175,7 @@
#define PACKAGE_NAME "JSON C Library"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "JSON C Library 0.12.99"
+#define PACKAGE_STRING "JSON C Library 0.13.99"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "json-c"
@@ -184,13 +184,13 @@
#define PACKAGE_URL "https://github.com/json-c/json-c"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.12.99"
+#define PACKAGE_VERSION "0.13.99"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.12.99"
+#define VERSION "0.13.99"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configure.ac b/configure.ac
index d29a387..ef556eb 100644
--- 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 442174f..a623f38 100644
--- 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