[SCM] vamp-plugin-sdk/master: Merge tag 'upstream/2.5'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1444e6ee671ff098efd85c40576abd73b0d8b522
X-Git-Newrev: d3383ddeacd7dcd6e9beb7f9b3fe6bc29e0d2afe

The following commit has been merged in the master branch:
commit d3383ddeacd7dcd6e9beb7f9b3fe6bc29e0d2afe
Merge: 1444e6ee671ff098efd85c40576abd73b0d8b522 d97d9e8d9d211ef6ba195927121daca855f5c9de
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 9 17:05:01 2013 +0200

    Merge tag 'upstream/2.5'
    
    Upstream version 2.5

diff --combined Makefile.in
index f74c51f,6125cb7..b1b6b60
--- a/Makefile.in
+++ b/Makefile.in
@@@ -38,9 -38,9 +38,11 @@@ default:	@TARGETS
  
  # Compile flags
  #
+ CC		= @CC@
+ CXX		= @CXX@
  CXXFLAGS	= -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
 +SUFFIX		:= $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 +LIBDIR		?= lib$(SUFFIX)
  
  # ar, ranlib
  #
@@@ -73,23 -73,23 +75,23 @@@ INSTALL_PREFIX	 	  = @prefix
  INSTALL_API_HEADERS	  = $(INSTALL_PREFIX)/include/vamp
  INSTALL_SDK_HEADERS	  = $(INSTALL_PREFIX)/include/vamp-sdk
  INSTALL_HOSTSDK_HEADERS	  = $(INSTALL_PREFIX)/include/vamp-hostsdk
 -INSTALL_SDK_LIBS	  = $(INSTALL_PREFIX)/lib
 -INSTALL_PLUGINS		  = $(INSTALL_PREFIX)/lib/vamp
 +INSTALL_SDK_LIBS	  = $(INSTALL_PREFIX)/$(LIBDIR)
 +INSTALL_PLUGINS		  = $(INSTALL_PREFIX)/$(LIBDIR)/vamp
  INSTALL_BINARIES	  = $(INSTALL_PREFIX)/bin 
  
- INSTALL_SDK_LIBNAME	  = libvamp-sdk.so.2.4.0
+ INSTALL_SDK_LIBNAME	  = libvamp-sdk.so.2.5.0
  INSTALL_SDK_LINK_ABI	  = libvamp-sdk.so.2
  INSTALL_SDK_LINK_DEV	  = libvamp-sdk.so
  INSTALL_SDK_STATIC        = libvamp-sdk.a
  INSTALL_SDK_LA            = libvamp-sdk.la
  
- INSTALL_HOSTSDK_LIBNAME   = libvamp-hostsdk.so.3.4.0
+ INSTALL_HOSTSDK_LIBNAME   = libvamp-hostsdk.so.3.5.0
  INSTALL_HOSTSDK_LINK_ABI  = libvamp-hostsdk.so.3
  INSTALL_HOSTSDK_LINK_DEV  = libvamp-hostsdk.so
  INSTALL_HOSTSDK_STATIC    = libvamp-hostsdk.a
  INSTALL_HOSTSDK_LA        = libvamp-hostsdk.la
  
 -INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/lib/pkgconfig
 +INSTALL_PKGCONFIG	  = $(INSTALL_PREFIX)/$(LIBDIR)/pkgconfig
  
  # Flags required to tell the compiler to create a dynamically loadable object
  #
diff --combined pkgconfig/vamp-hostsdk.pc.in
index e30f66f,7a00be4..844c8a1
--- a/pkgconfig/vamp-hostsdk.pc.in
+++ b/pkgconfig/vamp-hostsdk.pc.in
@@@ -1,10 -1,10 +1,10 @@@
  prefix=%PREFIX%
  exec_prefix=${prefix}
 -libdir=${exec_prefix}/lib
 +libdir=${prefix}%LIBDIR%
  includedir=${prefix}/include
  
  Name: vamp-hostsdk
- Version: 2.4
+ Version: 2.5
  Description: Development library for Vamp audio analysis plugin hosts
  Libs: -L${libdir} -lvamp-hostsdk -ldl
  Cflags: -I${includedir} 
diff --combined pkgconfig/vamp-sdk.pc.in
index dee6017,554ef24..523c71f
--- a/pkgconfig/vamp-sdk.pc.in
+++ b/pkgconfig/vamp-sdk.pc.in
@@@ -1,10 -1,10 +1,10 @@@
  prefix=%PREFIX%
  exec_prefix=${prefix}
 -libdir=${exec_prefix}/lib
 +libdir=${prefix}%LIBDIR%
  includedir=${prefix}/include
  
  Name: vamp-sdk
- Version: 2.4
+ Version: 2.5
  Description: Development library for Vamp audio analysis plugins
  Libs: -L${libdir} -lvamp-sdk
  Cflags: -I${includedir} 

-- 
vamp-plugin-sdk packaging