Skip to content

Commit

Permalink
jansson 2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
akheron committed May 5, 2020
1 parent 4c9018c commit 2882ead
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version 2.13
============

Released xxxx-xx-xx
Released 2020-05-05

* New Features:

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.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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
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.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])
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@

# 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

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_' \
-version-info 15:1:11 \
-version-info 16:0:12 \
@JSON_BSYMBOLIC_LDFLAGS@
4 changes: 2 additions & 2 deletions src/jansson.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 >= ... */
Expand Down

0 comments on commit 2882ead

Please sign in to comment.