diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-09-14 15:06:06 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-09-14 15:06:06 +0300 |
| commit | 7728716759b73ee95b84c33a922bdc628dc7d2a9 (patch) | |
| tree | 622b70df977d32e726fede31bb16698f2b575665 | |
| parent | 5406c2b3d347505149d382213b6f318f8c35de6a (diff) | |
| parent | b7bf96996f4db14c75499ddb529d5017893ad294 (diff) | |
| download | jansson-7728716759b73ee95b84c33a922bdc628dc7d2a9.zip jansson-7728716759b73ee95b84c33a922bdc628dc7d2a9.tar.gz jansson-7728716759b73ee95b84c33a922bdc628dc7d2a9.tar.bz2 | |
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
| -rw-r--r-- | CHANGES | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 13 insertions, 3 deletions
@@ -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 --- 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 --- 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 --- 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 |