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/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 diff --git a/configure.ac b/configure.ac index 66f6ccd..3a35945 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/Makefile.am b/doc/Makefile.am index f78afff..b00ee56 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 github_commits.c index.rst \ + tutorial.rst ext/refcounting.py clean-local: rm -rf .build diff --git a/doc/conf.py b/doc/conf.py index af371f6..d274f54 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.