aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2020-05-05 07:02:56 +0300
committerPetri Lehtinen <petri@digip.org>2020-05-05 07:07:16 +0300
commit2882ead5bb90cf12a01b07b2c2361e24960fae02 (patch)
treec50777fd6b8a63975e4ca6570fae584f701a6c7a
parent4c9018cc4c372f33013806ce7914fda965e3f9aa (diff)
downloadjansson-2882ead5bb90cf12a01b07b2c2361e24960fae02.zip
jansson-2882ead5bb90cf12a01b07b2c2361e24960fae02.tar.gz
jansson-2882ead5bb90cf12a01b07b2c2361e24960fae02.tar.bz2
jansson 2.13v2.13
-rw-r--r--CHANGES2
-rw-r--r--CMakeLists.txt4
-rw-r--r--LICENSE2
-rw-r--r--configure.ac2
-rw-r--r--doc/conf.py4
-rw-r--r--src/Makefile.am2
-rw-r--r--src/jansson.h4
7 files changed, 10 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index 8f4d868..744ca52 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
Version 2.13
============
-Released xxxx-xx-xx
+Released 2020-05-05
* New Features:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 420bfc1..3dbc4cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,10 +85,10 @@ endif()
# set (JANSSON_VERSION "2.3.1")
# set (JANSSON_SOVERSION 2)
-set(JANSSON_DISPLAY_VERSION "2.12")
+set(JANSSON_DISPLAY_VERSION "2.13")
# This is what is required to match the same numbers as automake's
-set(JANSSON_VERSION "4.11.1")
+set(JANSSON_VERSION "4.12.0")
set(JANSSON_SOVERSION 4)
# for CheckFunctionKeywords
diff --git a/LICENSE b/LICENSE
index ca2218c..483459c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2018 Petri Lehtinen <petri@digip.org>
+Copyright (c) 2009-2020 Petri Lehtinen <petri@digip.org>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/configure.ac b/configure.ac
index e845a4d..7b0244c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([jansson], [2.12], [https://github.com/akheron/jansson/issues])
+AC_INIT([jansson], [2.13], [https://github.com/akheron/jansson/issues])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([1.10 foreign])
diff --git a/doc/conf.py b/doc/conf.py
index 6b7f4c3..326b77a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,14 +41,14 @@ master_doc = 'index'
# General information about the project.
project = u'Jansson'
-copyright = u'2009-2016, Petri Lehtinen'
+copyright = u'2009-2020, Petri Lehtinen'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '2.12'
+version = '2.13'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/src/Makefile.am b/src/Makefile.am
index bd996cd..018262e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,5 +25,5 @@ libjansson_la_SOURCES = \
libjansson_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex '^json_' \
- -version-info 15:1:11 \
+ -version-info 16:0:12 \
@JSON_BSYMBOLIC_LDFLAGS@
diff --git a/src/jansson.h b/src/jansson.h
index ae1842c..7a54b31 100644
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
/* version */
#define JANSSON_MAJOR_VERSION 2
-#define JANSSON_MINOR_VERSION 12
+#define JANSSON_MINOR_VERSION 13
#define JANSSON_MICRO_VERSION 0
/* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION "2.12"
+#define JANSSON_VERSION "2.13"
/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */