# HG changeset patch
# User Chris Cannam
# Date 1322140684 0
# Node ID ef1dc9963638adc84bda46d4aa31b99f3229a892
# Parent  a3097781e894a3279025d65b245eee4309faa6fc
Update versions throughout

diff -r a3097781e894 -r ef1dc9963638 README
--- a/README	Wed Sep 28 16:38:40 2011 +0100
+++ b/README	Thu Nov 24 13:18:04 2011 +0000
@@ -9,7 +9,7 @@
 Vamp is an API for C and C++ plugins that process sampled audio data
 to produce descriptive output (measurements or semantic observations).
 
-This is version 2.2.1 of the Vamp plugin Software Development Kit.
+This is version 2.3 of the Vamp plugin Software Development Kit.
 
 Plugins and hosts built with this SDK are binary compatible with those
 built using version 1.0 of the SDK, with certain restrictions.  See
diff -r a3097781e894 -r ef1dc9963638 build/update-version.sh
--- a/build/update-version.sh	Wed Sep 28 16:38:40 2011 +0100
+++ b/build/update-version.sh	Thu Nov 24 13:18:04 2011 +0000
@@ -57,7 +57,7 @@
 $p 's/(VAMP_API_VERSION).*/$1 '$major'/' \
     vamp/vamp.h
 
-$p 's/(VAMP_SDK_VERSION)"[^"]*"/$1 "'$version'"/' \
+$p 's/(VAMP_SDK_VERSION) +"[^"]*"/$1 "'$version'"/' \
     vamp-sdk/PluginBase.h
 
 $p 's/(VAMP_SDK_MAJOR_VERSION).*/$1 '$major'/' \
@@ -66,16 +66,16 @@
 $p 's/(VAMP_SDK_MINOR_VERSION).*/$1 '$minor'/' \
     vamp-sdk/PluginBase.h
 
-$p 's/(VAMP_SDK_MAJOR_VERSION !=) \d+/$1 '$major'/' \
+$p 's/(VAMP_SDK_MAJOR_VERSION !=) [\d\.]+/$1 '$major'/' \
     src/vamp-sdk/PluginAdapter.cpp
 
-$p 's/(VAMP_SDK_MINOR_VERSION !=) \d+/$1 '$minor'/' \
+$p 's/(VAMP_SDK_MINOR_VERSION !=) [\d\.]+/$1 '$minor'/' \
     src/vamp-sdk/PluginAdapter.cpp
 
-$p 's/(VAMP_SDK_MAJOR_VERSION !=) \d+/$1 '$major'/' \
+$p 's/(VAMP_SDK_MAJOR_VERSION !=) [\d\.]+/$1 '$major'/' \
     src/vamp-hostsdk/PluginHostAdapter.cpp
 
-$p 's/(VAMP_SDK_MINOR_VERSION !=) \d+/$1 '$minor'/' \
+$p 's/(VAMP_SDK_MINOR_VERSION !=) [\d\.]+/$1 '$minor'/' \
     src/vamp-hostsdk/PluginHostAdapter.cpp
 
 for pc in pkgconfig/*.pc.in ; do
diff -r a3097781e894 -r ef1dc9963638 configure.ac
--- a/configure.ac	Wed Sep 28 16:38:40 2011 +0100
+++ b/configure.ac	Thu Nov 24 13:18:04 2011 +0000
@@ -1,5 +1,5 @@
 
-AC_INIT(vamp-plugin-sdk, 2.3.0, cannam@all-day-breakfast.com)
+AC_INIT(vamp-plugin-sdk, 2.3, cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(vamp/vamp.h)
 AC_PROG_CXX
diff -r a3097781e894 -r ef1dc9963638 pkgconfig/vamp-hostsdk.pc.in
--- a/pkgconfig/vamp-hostsdk.pc.in	Wed Sep 28 16:38:40 2011 +0100
+++ b/pkgconfig/vamp-hostsdk.pc.in	Thu Nov 24 13:18:04 2011 +0000
@@ -4,7 +4,7 @@
 includedir=${prefix}/include
 
 Name: vamp-hostsdk
-Version: 2.3.0
+Version: 2.3
 Description: Development library for Vamp audio analysis plugin hosts
 Libs: -L${libdir} -lvamp-hostsdk -ldl
 Cflags: -I${includedir} 
diff -r a3097781e894 -r ef1dc9963638 pkgconfig/vamp-sdk.pc.in
--- a/pkgconfig/vamp-sdk.pc.in	Wed Sep 28 16:38:40 2011 +0100
+++ b/pkgconfig/vamp-sdk.pc.in	Thu Nov 24 13:18:04 2011 +0000
@@ -4,7 +4,7 @@
 includedir=${prefix}/include
 
 Name: vamp-sdk
-Version: 2.3.0
+Version: 2.3
 Description: Development library for Vamp audio analysis plugins
 Libs: -L${libdir} -lvamp-sdk
 Cflags: -I${includedir} 
diff -r a3097781e894 -r ef1dc9963638 pkgconfig/vamp.pc.in
--- a/pkgconfig/vamp.pc.in	Wed Sep 28 16:38:40 2011 +0100
+++ b/pkgconfig/vamp.pc.in	Thu Nov 24 13:18:04 2011 +0000
@@ -4,7 +4,7 @@
 includedir=${prefix}/include
 
 Name: vamp
-Version: 2.3.0
+Version: 2.3
 Description: An API for audio analysis and feature extraction plugins
 Libs: 
 Cflags: -I${includedir} 
diff -r a3097781e894 -r ef1dc9963638 src/vamp-hostsdk/PluginHostAdapter.cpp
--- a/src/vamp-hostsdk/PluginHostAdapter.cpp	Wed Sep 28 16:38:40 2011 +0100
+++ b/src/vamp-hostsdk/PluginHostAdapter.cpp	Thu Nov 24 13:18:04 2011 +0000
@@ -37,7 +37,7 @@
 #include <vamp-hostsdk/PluginHostAdapter.h>
 #include <cstdlib>
 
-#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 2 )
+#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 3 )
 #error Unexpected version of Vamp SDK header included
 #endif
 
diff -r a3097781e894 -r ef1dc9963638 src/vamp-sdk/PluginAdapter.cpp
--- a/src/vamp-sdk/PluginAdapter.cpp	Wed Sep 28 16:38:40 2011 +0100
+++ b/src/vamp-sdk/PluginAdapter.cpp	Thu Nov 24 13:18:04 2011 +0000
@@ -39,7 +39,7 @@
 #include <cstring>
 #include <cstdlib>
 
-#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 2 )
+#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 3 )
 #error Unexpected version of Vamp SDK header included
 #endif
 
diff -r a3097781e894 -r ef1dc9963638 vamp-sdk/PluginBase.h
--- a/vamp-sdk/PluginBase.h	Wed Sep 28 16:38:40 2011 +0100
+++ b/vamp-sdk/PluginBase.h	Thu Nov 24 13:18:04 2011 +0000
@@ -40,9 +40,9 @@
 #include <string>
 #include <vector>
 
-#define VAMP_SDK_VERSION "3.5"
+#define VAMP_SDK_VERSION "2.3"
 #define VAMP_SDK_MAJOR_VERSION 2
-#define VAMP_SDK_MINOR_VERSION 2
+#define VAMP_SDK_MINOR_VERSION 3
 
 #include "plugguard.h"
 _VAMP_SDK_PLUGSPACE_BEGIN(PluginBase.h)