diff options
| author | Petri Lehtinen <petri@digip.org> | 2020-05-07 21:38:59 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2020-05-07 21:38:59 +0300 |
| commit | e9ebfa7e77a6bee77df44e096b100e7131044059 (patch) | |
| tree | b57c47a9220877f62e2f92999795c43cd31b2e24 | |
| parent | 3f4d94865289b0f18a29a502fa854130167948e0 (diff) | |
| download | jansson-2.13.zip jansson-2.13.tar.gz jansson-2.13.tar.bz2 | |
| -rw-r--r-- | CHANGES | 13 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jansson.h | 4 |
6 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,16 @@ +Version 2.13.1 +============== + +Released 2020-05-07 + +* Build: + + - Include `jansson_version_str()` and `jansson_version_cmp()` in + shared library. (#534) + + - Include `scripts/` in tarball. (#535) + + Version 2.13 ============ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dbc4cf..f8e7e84 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.13") +set(JANSSON_DISPLAY_VERSION "2.13.1") # This is what is required to match the same numbers as automake's -set(JANSSON_VERSION "4.12.0") +set(JANSSON_VERSION "4.13.0") set(JANSSON_SOVERSION 4) # for CheckFunctionKeywords diff --git a/configure.ac b/configure.ac index 7b0244c..d923eef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.13], [https://github.com/akheron/jansson/issues]) +AC_INIT([jansson], [2.13.1], [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 326b77a..24dcdb5 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,7 +48,7 @@ copyright = u'2009-2020, Petri Lehtinen' # built documents. # # The short X.Y version. -version = '2.13' +version = '2.13.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/src/Makefile.am b/src/Makefile.am index 2926172..91280c8 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_|^jansson_' \ - -version-info 16:0:12 \ + -version-info 17:0:13 \ @JSON_BSYMBOLIC_LDFLAGS@ diff --git a/src/jansson.h b/src/jansson.h index 7a54b31..fbc7381 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -22,10 +22,10 @@ extern "C" { #define JANSSON_MAJOR_VERSION 2 #define JANSSON_MINOR_VERSION 13 -#define JANSSON_MICRO_VERSION 0 +#define JANSSON_MICRO_VERSION 1 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "2.13" +#define JANSSON_VERSION "2.13.1" /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */ |