Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py

diff --git a/CHANGES b/CHANGES
index fc4078f..64ddd6f 100644 (file)
--- 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 3a35945..8de9c05 100644 (file)
--- 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 02b4c79..c13315a 100644 (file)
--- 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 (file)
--- 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

diff --git a/src/jansson.h b/src/jansson.h
index a3a97e0..c8a5a90 100644 (file)
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -9,7 +9,6 @@
 #define JANSSON_H
 
 #include <stdio.h>
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {