From ab6254473715499b49af506cad6082e9144eb078 Mon Sep 17 00:00:00 2001
From: David Henningsson <diwic@ubuntu.com>
Date: Sun, 4 Sep 2011 07:30:52 +0000
Subject: [PATCH] Prepare for 1.1.5 release

---
 fluidsynth/CMakeLists.txt                | 4 ++--
 fluidsynth/configure.ac                  | 4 ++--
 fluidsynth/doc/fluidsynth-v11-devdoc.txt | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fluidsynth/CMakeLists.txt b/fluidsynth/CMakeLists.txt
index 3fa0da99..31d33d61 100644
--- a/fluidsynth/CMakeLists.txt
+++ b/fluidsynth/CMakeLists.txt
@@ -29,7 +29,7 @@ set ( PACKAGE "fluidsynth" )
 # FluidSynth package version
 set ( FLUIDSYNTH_VERSION_MAJOR 1 )
 set ( FLUIDSYNTH_VERSION_MINOR 1 )
-set ( FLUIDSYNTH_VERSION_MICRO 4 )
+set ( FLUIDSYNTH_VERSION_MICRO 5 )
 set ( VERSION "${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}" )
 set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
 
@@ -44,7 +44,7 @@ set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
 # This is not exactly the same algorithm as the libtool one, but the results are the same.
 set ( LIB_VERSION_CURRENT 1 )
 set ( LIB_VERSION_AGE 5 )
-set ( LIB_VERSION_REVISION 0 )
+set ( LIB_VERSION_REVISION 1 )
 set ( LIB_VERSION_INFO
       "${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
 
diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index 7eee5e4b..89e4d979 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -8,7 +8,7 @@ dnl *** NOTE *** Don't forget to update library version below also
 
 FLUIDSYNTH_VERSION_MAJOR=1
 FLUIDSYNTH_VERSION_MINOR=1
-FLUIDSYNTH_VERSION_MICRO=4
+FLUIDSYNTH_VERSION_MICRO=5
 FLUIDSYNTH_VERSION=$FLUIDSYNTH_VERSION_MAJOR.$FLUIDSYNTH_VERSION_MINOR.$FLUIDSYNTH_VERSION_MICRO
 
 AC_SUBST(FLUIDSYNTH_VERSION_MAJOR)
@@ -29,7 +29,7 @@ dnl if any interfaces have been added: lt_age++
 dnl if any interfaces have been removed/changed (compatibility broken): lt_age=0
 
 m4_define([lt_current], [6])
-m4_define([lt_revision], [0])
+m4_define([lt_revision], [1])
 m4_define([lt_age], [5])
 
 LT_VERSION_INFO="lt_current:lt_revision:lt_age"
diff --git a/fluidsynth/doc/fluidsynth-v11-devdoc.txt b/fluidsynth/doc/fluidsynth-v11-devdoc.txt
index 62537f2d..60484dbf 100644
--- a/fluidsynth/doc/fluidsynth-v11-devdoc.txt
+++ b/fluidsynth/doc/fluidsynth-v11-devdoc.txt
@@ -20,6 +20,7 @@ All the source code examples in this document are in the public domain; you can
 
 - \ref Disclaimer 
 - \ref Introduction 
+- \ref NewIn1_1_5
 - \ref NewIn1_1_4
 - \ref NewIn1_1_3
 - \ref NewIn1_1_2
@@ -61,6 +62,13 @@ What is FluidSynth?
 
 - FluidSynth is open source, in active development. For more details, take a look at http://www.fluidsynth.org
 
+\section NewIn1_1_5 Whats new in 1.1.5?
+
+Changes in FluidSynth 1.1.5 concerning developers:
+- A change in the Jack driver might require a newer Jack version compared to 1.1.4.
+- For a full list of bug fixes, see
+  http://sourceforge.net/apps/trac/fluidsynth/wiki/ChangeLog1_1_5
+
 \section NewIn1_1_4 Whats new in 1.1.4?
 
 Changes in FluidSynth 1.1.4 concerning developers: