aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES30
-rw-r--r--configure.ac2
-rw-r--r--doc/Makefile.am5
-rw-r--r--doc/conf.py2
-rw-r--r--src/Makefile.am2
5 files changed, 36 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index dcbf6a0..19226de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,36 @@ Version 1.3 (in development)
keys.
+Version 1.2.1
+=============
+
+Released 2010-04-03
+
+* Bug fixes:
+
+ - Fix reference counting on ``true``, ``false`` and ``null``
+ - Estimate real number underflows in decoder with 0.0 instead of
+ issuing an error
+
+* Portability:
+
+ - Make ``int32_t`` available on all systems
+ - Support compilers that don't have the ``inline`` keyword
+ - Require Autoconf 2.60 (for ``int32_t``)
+
+* Tests:
+
+ - Print test names correctly when ``VERBOSE=1``
+ - ``test/suites/api``: Fail when a test fails
+ - Enhance tests for iterators
+ - Enhance tests for decoding texts that contain null bytes
+
+* Documentation:
+
+ - Don't remove ``changes.rst`` in ``make clean``
+ - Add a chapter on RFC conformance
+
+
Version 1.2
===========
diff --git a/configure.ac b/configure.ac
index 9a4bd99..a42a99c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([jansson], [1.2+], [petri@digip.org])
+AC_INIT([jansson], [1.2.1+], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d620775..74a715c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
-EXTRA_DIST = conf.py apiref.rst changes.rst gettingstarted.rst \
- github_commits.c index.rst tutorial.rst ext/refcounting.py
+EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst \
+ gettingstarted.rst github_commits.c index.rst tutorial.rst \
+ ext/refcounting.py
SPHINXBUILD = sphinx-build
SPHINXOPTS = -d _build/doctrees -W
diff --git a/doc/conf.py b/doc/conf.py
index 2a95aad..b0625e1 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -52,7 +52,7 @@ copyright = u'2009, 2010 Petri Lehtinen'
# The short X.Y version.
version = '1.2'
# The full version, including alpha/beta/rc tags.
-release = '1.2+'
+release = '1.2.1+'
# 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 92fc90c..0934ebf 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:0:2
+ -version-info 2:1:2
AM_CFLAGS = -Wall -Wextra -Werror