jansson 2.8

akheron · Aug 30, 2016 · 012c5f0 · 012c5f0 · HalosGhost · Sep 8, 2016
1 parent a931aac
commit 012c5f0
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 26 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,7 @@
 Version 2.8
 ===========
 
-Released 2016-08-26
+Released 2016-08-30
 
 * New features:
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,10 +86,10 @@ endif (WIN32)
 # set (JANSSON_VERSION "2.3.1")
 # set (JANSSON_SOVERSION 2)
 
-set(JANSSON_DISPLAY_VERSION "2.7")
+set(JANSSON_DISPLAY_VERSION "2.8")
 
 # This is what is required to match the same numbers as automake's
-set(JANSSON_VERSION "4.7.0")
+set(JANSSON_VERSION "4.8.0")
 set(JANSSON_SOVERSION 4)
 
 # for CheckFunctionKeywords

diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = CHANGES LICENSE README.rst CMakeLists.txt cmake android
+EXTRA_DIST = CHANGES LICENSE README.rst CMakeLists.txt cmake android examples
 SUBDIRS = doc src test
 
 # "make distcheck" builds the dvi target, so use it to check that the

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.7], [petri@digip.org])
+AC_INIT([jansson], [2.8], [petri@digip.org])
 
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([1.10 foreign])
@@ -114,6 +114,5 @@ AC_CONFIG_FILES([
         test/bin/Makefile
         test/suites/Makefile
         test/suites/api/Makefile
-        examples/Makefile
 ])
 AC_OUTPUT
diff --git a/doc/gettingstarted.rst b/doc/gettingstarted.rst
@@ -219,7 +219,9 @@ link the program as follows::
 
     cc -o prog prog.c -ljansson
 
-Starting from version 1.2, there's also support for pkg-config_::
+Starting from version 1.2, there's also support for pkg-config_:
+
+.. code-block:: shell
 
     cc -o prog prog.c `pkg-config --cflags --libs jansson`
 

diff --git a/doc/tutorial.rst b/doc/tutorial.rst
@@ -256,7 +256,9 @@ For a detailed explanation of reference counting in Jansson, see
 :ref:`apiref-reference-count` in :ref:`apiref`.
 
 The program's ready, let's test it and view the latest commits in
-Jansson's repository::
+Jansson's repository:
+
+.. code-block:: shell
 
     $ ./github_commits akheron jansson
     1581f26a Merge branch '2.3'

diff --git a/examples/Makefile.am b/examples/Makefile.am
diff --git a/examples/README.rst b/examples/README.rst
@@ -2,9 +2,3 @@ Jansson examples
 ================
 
 This directory contains simple example programs that use Jansson.
-
-You can compile the examples by running the configure script normally
-in Jansson's top directory, and then::
-
-    cd examples
-    make
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -23,4 +23,4 @@ libjansson_la_SOURCES = \
 libjansson_la_LDFLAGS = \
 	-no-undefined \
 	-export-symbols-regex '^json_' \
-	-version-info 11:0:7
+	-version-info 12:0:8
diff --git a/src/jansson.h b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  7
+#define JANSSON_MINOR_VERSION  8
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.7"
+#define JANSSON_VERSION  "2.8"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */