[SCM] vamp-plugin-sdk/master: Patches refreshed.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 24b98a122188b01936e07a6e86ed9f6496e4fc00
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 16 22:31:12 2015 +0200

    Patches refreshed.

diff --git a/debian/patches/01-fix_multiarch.patch b/debian/patches/01-fix_multiarch.patch
index 23b4f5d..7faf63b 100644
--- a/debian/patches/01-fix_multiarch.patch
+++ b/debian/patches/01-fix_multiarch.patch
@@ -2,20 +2,20 @@ Description: Patch fixing multiarch build
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: yes
 
-Index: vamp-plugin-sdk-2.5/Makefile.in
+Index: vamp-plugin-sdk/Makefile.in
 ===================================================================
---- vamp-plugin-sdk-2.5.orig/Makefile.in	2013-05-26 00:43:52.787522806 +0200
-+++ vamp-plugin-sdk-2.5/Makefile.in	2013-05-26 00:43:52.783522806 +0200
-@@ -41,6 +41,8 @@
- CC		= @CC@
+--- vamp-plugin-sdk.orig/Makefile.in
++++ vamp-plugin-sdk/Makefile.in
+@@ -42,6 +42,8 @@ CC		= @CC@
  CXX		= @CXX@
+ CFLAGS		= @CFLAGS@
  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,8 +75,8 @@
+@@ -74,8 +76,8 @@ 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
@@ -26,7 +26,7 @@ Index: vamp-plugin-sdk-2.5/Makefile.in
  INSTALL_BINARIES	  = $(INSTALL_PREFIX)/bin 
  
  INSTALL_SDK_LIBNAME	  = libvamp-sdk.so.2.5.0
-@@ -89,7 +91,7 @@
+@@ -90,7 +92,7 @@ INSTALL_HOSTSDK_LINK_DEV  = libvamp-host
  INSTALL_HOSTSDK_STATIC    = libvamp-hostsdk.a
  INSTALL_HOSTSDK_LA        = libvamp-hostsdk.la
  
diff --git a/debian/patches/02-fix_pkg-config.patch b/debian/patches/02-fix_pkg-config.patch
index f896d72..bfd0a45 100644
--- a/debian/patches/02-fix_pkg-config.patch
+++ b/debian/patches/02-fix_pkg-config.patch
@@ -2,8 +2,10 @@ Description: Patch fixing pkg-config.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
---- a/pkgconfig/vamp-hostsdk.pc.in
-+++ b/pkgconfig/vamp-hostsdk.pc.in
+Index: vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in
+===================================================================
+--- vamp-plugin-sdk.orig/pkgconfig/vamp-hostsdk.pc.in
++++ vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in
 @@ -1,7 +1,7 @@
 -prefix=%PREFIX%
 -exec_prefix=${prefix}
@@ -16,8 +18,10 @@ Forwarded: no
  
  Name: vamp-hostsdk
  Version: 2.5
---- a/pkgconfig/vamp-sdk.pc.in
-+++ b/pkgconfig/vamp-sdk.pc.in
+Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
+===================================================================
+--- vamp-plugin-sdk.orig/pkgconfig/vamp-sdk.pc.in
++++ vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
 @@ -1,7 +1,7 @@
 -prefix=%PREFIX%
 -exec_prefix=${prefix}
@@ -30,8 +34,10 @@ Forwarded: no
  
  Name: vamp-sdk
  Version: 2.5
---- a/pkgconfig/vamp.pc.in
-+++ b/pkgconfig/vamp.pc.in
+Index: vamp-plugin-sdk/pkgconfig/vamp.pc.in
+===================================================================
+--- vamp-plugin-sdk.orig/pkgconfig/vamp.pc.in
++++ vamp-plugin-sdk/pkgconfig/vamp.pc.in
 @@ -1,7 +1,7 @@
 -prefix=%PREFIX%
 -exec_prefix=${prefix}
@@ -44,9 +50,11 @@ Forwarded: no
  
  Name: vamp
  Version: 2.5
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -261,6 +261,7 @@
+Index: vamp-plugin-sdk/Makefile.in
+===================================================================
+--- vamp-plugin-sdk.orig/Makefile.in
++++ vamp-plugin-sdk/Makefile.in
+@@ -265,6 +265,7 @@ clean:
  distclean:	clean
  		rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) *~ */*~
  		rm -f config.log config.status Makefile
@@ -54,7 +62,7 @@ Forwarded: no
  
  install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET)
  		mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
-@@ -290,12 +291,9 @@
+@@ -294,12 +295,9 @@ install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(
  		ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
  		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
  		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
@@ -70,12 +78,14 @@ Forwarded: no
  		sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \
  		    -e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \
  		    -e "s,%LINK_DEV%,$(INSTALL_SDK_LINK_DEV),g" \
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,5 +50,10 @@
- changequote([,])dnl
+Index: vamp-plugin-sdk/configure.ac
+===================================================================
+--- vamp-plugin-sdk.orig/configure.ac
++++ vamp-plugin-sdk/configure.ac
+@@ -55,5 +55,10 @@ changequote([,])dnl
  
  AC_SUBST(CXXFLAGS)
+ AC_SUBST(CFLAGS)
 -AC_OUTPUT([Makefile])
 +AC_OUTPUT([
 +	Makefile

-- 
vamp-plugin-sdk packaging