Merge branch '2.0'

Conflicts:
	doc/conf.py
	src/jansson.h

CHANGES

@@ -1,3 +1,34 @@
+Version 2.0.1
+=============
+
+Released 2011-03-31
+
+* Bug fixes:
+
+  - Replace a few `malloc()` and `free()` calls with their
+    counterparts that support custom memory management.
+
+  - Fix object key hashing in json_unpack() strict checking mode.
+
+  - Fix the parentheses in JANSSON_VERSION_HEX macro.
+
+  - Fix `json_object_size()` return value.
+
+  - Fix a few compilation issues.
+
+* Portability:
+
+  - Enhance portability of `va_copy()`.
+
+  - Test framework portability enhancements.
+
+* Documentation:
+
+  - Distribute ``doc/upgrading.rst`` with the source tarball.
+
+  - Build documentation in strict mode in ``make distcheck``.
+
+
 Version 2.0
 ===========
 

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.0], [petri@digip.org])
+AC_INIT([jansson], [2.0.1+git], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

doc/conf.py

@@ -50,7 +50,7 @@ copyright = u'2009-2011, Petri Lehtinen'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0+git'
+release = '2.0.1+git'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/Makefile.am

@@ -17,7 +17,7 @@ libjansson_la_SOURCES = \
 	value.c
 libjansson_la_LDFLAGS = \
 	-export-symbols-regex '^json_' \
-	-version-info 4:0:0
+	-version-info 4:1:0
 
 if GCC
 # These flags are gcc specific

src/jansson.h

@@ -25,7 +25,7 @@ extern "C" {
 #define JANSSON_MICRO_VERSION  255
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.0"
+#define JANSSON_VERSION  "2.0.1+git"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */