organicmaps/jansson
13
Fork 0
mirror of https://github.com/akheron/jansson.git synced 2025-04-06 05:55:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge branch '1.1'

Browse source 
Conflicts:
	CHANGES
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen 2009-10-26 21:33:03 +02:00
commit d1b07171cc
5 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -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:

5
Makefile.am
View file

@ -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

2
configure.ac
View file

@ -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])

4
doc/Makefile.am
View file

@ -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

2
doc/conf.py
View file

@ -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.