Merge remote-tracking branch 'origin/master' into json-c-0.10json-c-0.10-20120530

2 files changed, 52 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d2c9af..e0fd4a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,26 @@
 0.10
+
+  * Add a json_object_to_json_string_ext() function to allow output to be
+     formatted in a more human readable form.
+  * Add json_object_object_get_ex(), a NULL-safe get object method, to be able
+     to distinguish between a key not present and the value being NULL.
+  * Add an alternative iterator implementation, see json_object_iterator.h
+  * Make json_object_iter public to enable external use of the
+     json_object_object_foreachC macro.
+  * Add a printbuf_memset() function to provide an effecient way to set and
+     append things like whitespace indentation.
+  * Adjust json_object_is_type and json_object_get_type so they return
+      json_type_null for NULL objects and handle NULL passed to
+      json_objct_object_get().
+  * Rename boolean type to json_bool.
+  * Fix various compile issues for Visual Studio and MinGW.
+  * Allow json_tokener_parse_ex() to be re-used to parse multiple object.
+     Also, fix some parsing issues with capitalized hexadecimal numbers and
+     number in E notation.
+  * Add json_tokener_get_error() and json_tokener_error_desc() to better 
+     encapsulate the process of retrieving errors while parsing.
+  * Various improvements to the documentation of many functions.
+  * Add new json_object_array_sort() function.
   * Fix a bug in json_object_get_int(), which would incorrectly return 0
     when called on a string type object.
     Eric Haszlakiewicz
diff --git a/RELEASE_CHECKLIST.txt b/RELEASE_CHECKLIST.txt
index 1a8d555..28f5b89 100644
--- a/RELEASE_CHECKLIST.txt
+++ b/RELEASE_CHECKLIST.txt
@@ -6,20 +6,43 @@ git clone https://github.com/json-c/json-c json-c-${release}
 cd json-c-${release}
 
 Check that the compile works on Linux
+Check that the compile works on NetBSD
 Check that the compile works on Windows
 Check ChangeLog to see if anything should be added.
 
-git branch json-c-${release}
-git checkout json-c-${release}
-sh autogen.sh
-XXX doxygen
+  git branch json-c-${release}
+  git checkout json-c-${release}
 
-XXX Add generated files to git?
+Generate the configure script and other files:
+  sh autogen.sh
+  git add -f Makefile.in aclocal.m4 config.guess \
+       config.sub configure depcomp install-sh \
+       ltmain.sh missing tests/Makefile.in
+
+  # check for anything else to be added:
+  git status --ignored
+  git commit
+
+Generate the doxygen documentation:
+  doxygen
+  git add doc
+  git commit doc
 
 cd ..
-tar czf json-c-${release}.tar.gz json-c-${release}
+echo .git > excludes
+echo autom4te.cache >> excludes
+tar -czf json-c-${release}.tar.gz -X excludes json-c-${release}
+
+echo doc >> excludes
+tar -czf json-c-${release}-doc.tar.gz -X excludes json-c-${release}
+
+Tag the branch:
+cd json-c-${release}
+git tag json-c-${release}-$(date +%Y%m%d)
+
+Go to https://github.com/json-c/json-c/downloads
+Upload the two tarballs.
 
-XXX upload tarball to ???
 
 ===================================