From 012c5f0ecac48db286d4d737133b6d64d128939c Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Tue, 30 Aug 2016 21:09:28 +0300
Subject: [PATCH] jansson 2.8

---
 CHANGES                | 2 +-
 CMakeLists.txt         | 4 ++--
 Makefile.am            | 2 +-
 configure.ac           | 3 +--
 doc/gettingstarted.rst | 4 +++-
 doc/tutorial.rst       | 4 +++-
 examples/Makefile.am   | 9 ---------
 examples/README.rst    | 6 ------
 src/Makefile.am        | 2 +-
 src/jansson.h          | 4 ++--
 10 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 examples/Makefile.am

diff --git a/CHANGES b/CHANGES
index 73db7bf..5f81c5e 100644
--- 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
index db8f3ca..da844a9 100644
--- 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
index ccd70e9..0de2ac1 100644
--- 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
index 5b85180..17db6fc 100644
--- 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
index 8fc9442..292cfb6 100644
--- 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
index c2df081..a92f488 100644
--- 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
deleted file mode 100644
index f8735fc..0000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-EXTRA_PROGRAMS = simple_parse
-
-simple_parse_SOURCES = simple_parse.c
-
-AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
-LDFLAGS = -static  # for easier running
-LDADD = $(top_builddir)/src/libjansson.la
-
-all: simple_parse
diff --git a/examples/README.rst b/examples/README.rst
index 1dcb040..a7c5274 100644
--- 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
index b5db968..f0fd343 100644
--- 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
index ee60794..17a6e7a 100644
--- 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 >= ... */