aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2010-06-13 20:37:33 +0300
committerPetri Lehtinen <petri@digip.org>2010-06-13 20:37:33 +0300
commit2caac965d4f675b51815be4a5ae1f305587be911 (patch)
treeb0bdddd7758be9365cb7bcfa98e61b6ae4310f17
parent1347686dbf7c06e03d6a3d5c8999315cc7158af3 (diff)
downloadjansson-2caac965d4f675b51815be4a5ae1f305587be911.zip
jansson-2caac965d4f675b51815be4a5ae1f305587be911.tar.gz
jansson-2caac965d4f675b51815be4a5ae1f305587be911.tar.bz2
jansson 1.3v1.3
-rw-r--r--CHANGES20
-rw-r--r--configure.ac2
-rw-r--r--doc/conf.py4
-rw-r--r--src/Makefile.am2
4 files changed, 22 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 19226de..73d149c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,27 @@
-Version 1.3 (in development)
-============================
+Version 1.3
+===========
+
+Released 2010-06-13
* New encoding flags:
- ``JSON_PRESERVE_ORDER``: Preserve the insertion order of object
keys.
+* Bug fixes:
+
+ - Fix an error that occured when an array or object was first
+ encoded as empty, then populated with some data, and then
+ re-encoded
+
+ - Fix the situation like above, but when the first encoding resulted
+ in an error
+
+* Documentation:
+
+ - Clarify the documentation on reference stealing, providing an
+ example usage pattern
+
Version 1.2.1
=============
diff --git a/configure.ac b/configure.ac
index a42a99c..4a199e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([jansson], [1.2.1+], [petri@digip.org])
+AC_INIT([jansson], [1.3], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
diff --git a/doc/conf.py b/doc/conf.py
index b0625e1..f0e8cc0 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -50,9 +50,9 @@ copyright = u'2009, 2010 Petri Lehtinen'
# built documents.
#
# The short X.Y version.
-version = '1.2'
+version = '1.3'
# The full version, including alpha/beta/rc tags.
-release = '1.2.1+'
+release = '1.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 f867fa0..cb9180e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,6 @@ libjansson_la_SOURCES = \
value.c
libjansson_la_LDFLAGS = \
-export-symbols-regex '^json_' \
- -version-info 2:1:2
+ -version-info 3:0:3
AM_CFLAGS = -Wall -Wextra -Werror