aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2009-11-08 14:13:32 +0200
committerPetri Lehtinen <petri@digip.org>2009-11-08 14:13:32 +0200
commit842bc2128b70e5390cacf83a24375cd5c0d0341c (patch)
tree1d087f56ba426e60486692720a9649fd6c7989b6
parentca6d26a1c2c4626c93b863580bf0959e690c446c (diff)
downloadjansson-842bc2128b70e5390cacf83a24375cd5c0d0341c.zip
jansson-842bc2128b70e5390cacf83a24375cd5c0d0341c.tar.gz
jansson-842bc2128b70e5390cacf83a24375cd5c0d0341c.tar.bz2
jansson 1.1.2v1.1.2
-rw-r--r--CHANGES9
-rw-r--r--configure.ac2
-rw-r--r--doc/conf.py2
-rw-r--r--src/Makefile.am2
4 files changed, 12 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index fc4078f..64ddd6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+Version 1.1.2, released 2009-11-08
+
+* Fix a bug where an error message was not produced if the input file
+ could not be opened in json_load_file()
+* Fix an assertion failure in decoder caused by a minus sign without a
+ digit after it
+* Remove an unneeded include for stdint.h in jansson.h
+
+
Version 1.1.1, released 2009-10-26
* All documentation files were not distributed with v1.1; build
diff --git a/configure.ac b/configure.ac
index 29d61ed..1a6f7e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.59])
-AC_INIT([jansson], [1.1.1], [petri@digip.org])
+AC_INIT([jansson], [1.1.2], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
diff --git a/doc/conf.py b/doc/conf.py
index 1b1a592..be257e1 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen'
# The short X.Y version.
version = '1.1'
# The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.1.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ca1ce7..9e9ee6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,6 @@ libjansson_la_SOURCES = \
utf.h \
util.h \
value.c
-libjansson_la_LDFLAGS = -version-info 1:0:1
+libjansson_la_LDFLAGS = -version-info 1:1:1
AM_CFLAGS = -Wall -Wextra -Werror