Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py

diff --git a/CHANGES b/CHANGES
index 6211d86..b755ca0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,21 @@
+Version 1.0.3, released 2009-09-14
+
+* Check for integer and real overflows and underflows in decoder
+* Use the Python json module for tests, or simplejson if the json
+  module is not found
+* Distribute changelog (this file)
+
+
 Version 1.0.2, released 2009-09-08
 
 * Handle EOF correctly in decoder
 
+
 Version 1.0.1, released 2009-09-04
 
 * Fixed broken json_is_boolean()
 
+
 Version 1.0, released 2009-08-25
 
 * Initial release

diff --git a/configure.ac b/configure.ac
index 1ad73a9..2835ad3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([jansson], [1.0.2+], [petri@digip.org])
+AC_INIT([jansson], [1.0.3+], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

diff --git a/doc/conf.py b/doc/conf.py
index 911436a..3ccd920 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.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.2+'
+release = '1.0.3+'
 
 # 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 5165476..a737c90 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 0:2:0
+libjansson_la_LDFLAGS = -version-info 0:3:0
 
 AM_CFLAGS = -Wall -Wextra -Werror