From 7c7a1ed01eaffb5d211eebb14f3f139b102c4364 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Wed, 21 Oct 2009 08:52:34 +0300 Subject: [PATCH 1/5] Fix version 1.1 release date in CHANGES --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3e3a70d..729d5e8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -Version 1.1, released 2009-10-XX +Version 1.1, released 2009-10-20 * API additions and improvements: - Extend array and object APIs From 9448ed3ef7a2dd0238d9d8d2c684eb1d499cf607 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 24 Oct 2009 13:41:39 +0300 Subject: [PATCH 2/5] Distribute all the docs --- doc/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index f78afff..2d0c9e7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,6 @@ -EXTRA_DIST = conf.py apiref.rst index.rst ext/refcounting.py +EXTRA_DIST = \ + conf.py apiref.rst gettingstarted.rst index.rst \ + tutorial.rst ext/refcounting.py clean-local: rm -rf .build From f95bb423a36ecac8a588def950ee4cf155dd3144 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sun, 25 Oct 2009 00:17:16 +0300 Subject: [PATCH 3/5] Really distribute all the docs The tutorial example github_commits.c was still left out. --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 2d0c9e7..b00ee56 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = \ - conf.py apiref.rst gettingstarted.rst index.rst \ + conf.py apiref.rst gettingstarted.rst github_commits.c index.rst \ tutorial.rst ext/refcounting.py clean-local: From 59c58ea26c61d92d257b7a5971bcd3bdb235177f Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sun, 25 Oct 2009 00:18:03 +0300 Subject: [PATCH 4/5] Build documentation in distcheck-hook This is to check that all the documentation files are distributed before releasing. --- Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index 01b958c..e64f397 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,7 @@ EXTRA_DIST = CHANGES LICENSE README.rst SUBDIRS = doc src test + +distcheck-hook: + sphinx-build -b html -W \ + $(distdir)/doc \ + $(distdir)/_build/doc/.build/html From 15d992cb6a6eeab8c2f4c7d00fa06a52fca62287 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Mon, 26 Oct 2009 21:27:10 +0200 Subject: [PATCH 5/5] jansson 1.1.1 --- CHANGES | 7 +++++++ configure.ac | 2 +- doc/conf.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 729d5e8..fc4078f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Version 1.1.1, released 2009-10-26 + +* All documentation files were not distributed with v1.1; build + documentation in make distcheck to prevent this in the future +* Fix v1.1 release date in CHANGES + + Version 1.1, released 2009-10-20 * API additions and improvements: diff --git a/configure.ac b/configure.ac index 7256d07..29d61ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.59]) -AC_INIT([jansson], [1.1], [petri@digip.org]) +AC_INIT([jansson], [1.1.1], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/conf.py b/doc/conf.py index b8694ea..1b1a592 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen' # The short X.Y version. version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.1' +release = '1.1.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.