Skip to content

Commit

Permalink
jansson 2.13.1
Browse files Browse the repository at this point in the history
  • Loading branch information
akheron committed May 7, 2020
1 parent 3f4d948 commit e9ebfa7
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 7 deletions.
13 changes: 13 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -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
============

Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# built documents.
#
# The short X.Y version.
version = '2.13'
version = '2.13.1'
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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@
4 changes: 2 additions & 2 deletions src/jansson.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 >= ... */
Expand Down

0 comments on commit e9ebfa7

Please sign in to comment.