From 325101e525087a24fcdf34da0fe0d4a6c9756d28 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Tue, 20 Oct 2009 21:29:16 +0300
Subject: [PATCH] jansson 1.1

---
 CHANGES         | 20 ++++++++++++++++++++
 configure.ac    |  2 +-
 doc/conf.py     |  4 ++--
 src/Makefile.am |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5aaacb5..3e3a70d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,23 @@
+Version 1.1, released 2009-10-XX
+
+* API additions and improvements:
+  - Extend array and object APIs
+  - Add functions to modify integer, real and string values
+  - Improve argument validation
+  - Use unsigned int instead of uint32_t for encoding flags
+* Enhance documentation
+  - Add getting started guide and tutorial
+  - Fix some typos
+  - General clarifications and cleanup
+* Check for integer and real overflows and underflows in decoder
+* Make singleton values thread-safe (true, false and null)
+* Enhance circular reference handling
+* Don't define -std=c99 in AM_CFLAGS
+* Add C++ guards to jansson.h
+* Minor performance and portability improvements
+* Expand test coverage
+
+
 Version 1.0.4, released 2009-10-11
 
 * Relax Autoconf version requirement to 2.59
diff --git a/configure.ac b/configure.ac
index c2de72f..7256d07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.59])
-AC_INIT([jansson], [1.0.4+], [petri@digip.org])
+AC_INIT([jansson], [1.1], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 
diff --git a/doc/conf.py b/doc/conf.py
index 16d9c80..b8694ea 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -50,9 +50,9 @@ copyright = u'2009, Petri Lehtinen'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.4+'
+release = '1.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 36f8467..6ca1ce7 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:4:0
+libjansson_la_LDFLAGS = -version-info 1:0:1
 
 AM_CFLAGS = -Wall -Wextra -Werror