[SCM] vamp-plugin-sdk/master: Starting with multi-arch

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

The following commit has been merged in the master branch:
commit 896c556a5757ca7bb76850865684c6d9bd058fdf
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Oct 31 02:06:54 2012 +0100

    Starting with multi-arch

diff --git a/debian/control b/debian/control
index 6dcd0b3..c7070f7 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Depends:
  libvamp-sdk2 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
 Description: audio analysis and feature extraction plugins (SDK)
  Vamp is an audio processing plugin system for plugins that extract
  descriptive information from audio data - typically referred to as
@@ -45,6 +46,8 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: helper library for Vamp plugins written in C++
  Vamp is an audio processing plugin system for plugins that extract
  descriptive information from audio data - typically referred to as
@@ -58,6 +61,8 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: helper library for Vamp hosts written in C++
  Vamp is an audio processing plugin system for plugins that extract
  descriptive information from audio data - typically referred to as
diff --git a/debian/libvamp-hostsdk3.install b/debian/libvamp-hostsdk3.install
index 15c11d7..abc8108 100644
--- a/debian/libvamp-hostsdk3.install
+++ b/debian/libvamp-hostsdk3.install
@@ -1 +1 @@
-usr/lib/libvamp-hostsdk.so.*
+usr/lib/*/libvamp-hostsdk.so.*
diff --git a/debian/libvamp-sdk2.install b/debian/libvamp-sdk2.install
index 4894f3e..3ad3036 100644
--- a/debian/libvamp-sdk2.install
+++ b/debian/libvamp-sdk2.install
@@ -1 +1 @@
-usr/lib/libvamp-sdk.so.*
+usr/lib/*/libvamp-sdk.so.*
diff --git a/debian/patches/01-fix_multiarch.patch b/debian/patches/01-fix_multiarch.patch
new file mode 100644
index 0000000..edcbdc4
--- /dev/null
+++ b/debian/patches/01-fix_multiarch.patch
@@ -0,0 +1,61 @@
+Description: Patch fixing multiarch build 
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: vamp-plugin-sdk/Makefile.in
+===================================================================
+--- vamp-plugin-sdk.orig/Makefile.in	2012-10-31 01:34:12.656708753 +0100
++++ vamp-plugin-sdk/Makefile.in	2012-10-31 01:40:36.400724353 +0100
+@@ -39,6 +39,8 @@
+ # Compile flags
+ #
+ 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
+ #
+@@ -71,8 +73,8 @@
+ 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
+@@ -87,7 +89,7 @@
+ 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
+ #
+Index: vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in
+===================================================================
+--- vamp-plugin-sdk.orig/pkgconfig/vamp-hostsdk.pc.in	2012-10-31 01:34:12.656708753 +0100
++++ vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in	2012-10-31 01:40:13.232723415 +0100
+@@ -1,6 +1,6 @@
+ prefix=%PREFIX%
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${prefix}%LIBDIR%
+ includedir=${prefix}/include
+ 
+ Name: vamp-hostsdk
+Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in
+===================================================================
+--- vamp-plugin-sdk.orig/pkgconfig/vamp-sdk.pc.in	2012-10-31 01:34:12.656708753 +0100
++++ vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in	2012-10-31 01:40:13.232723415 +0100
+@@ -1,6 +1,6 @@
+ prefix=%PREFIX%
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${prefix}%LIBDIR%
+ includedir=${prefix}/include
+ 
+ Name: vamp-sdk
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2f0dafa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix_multiarch.patch
diff --git a/debian/rules b/debian/rules
index ae7bc4f..63a7850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 
 LDFLAGS+=-Wl,--as-needed
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export PREFIX=/usr
+export LIBDIR=lib/$(DEB_HOST_MULTIARCH)
+export DESTDIR=$(CURDIR)/debian/tmp
+
 %:
 	dh $@
 
diff --git a/debian/vamp-plugin-sdk.install b/debian/vamp-plugin-sdk.install
index 28f80fd..fc95c8c 100644
--- a/debian/vamp-plugin-sdk.install
+++ b/debian/vamp-plugin-sdk.install
@@ -1,6 +1,6 @@
 usr/bin/vamp-rdf-template-generator
-usr/include
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/include/*
+#usr/lib/*.a
+#usr/lib/*.la
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*

-- 
vamp-plugin-sdk packaging