[SCM] zita-convolver/master: Introduce multiarch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1b6724570094fdfa0601692ef250348c64001352
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 21 19:10:47 2011 +0200

    Introduce multiarch support.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 00d692e..19fbefd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Free Ekanayaka <freee at debian.org>,
  Alessio Treglia <alessio at debian.org>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  binutils,
  libfftw3-dev (>= 3.1.2-3.1)
 DM-Upload-Allowed: yes
@@ -20,6 +20,7 @@ Architecture: any
 Depends: libzita-convolver3 (= ${binary:Version}),
  ${misc:Depends},
  libfftw3-dev (>= 3.1.2-3.1)
+Multi-Arch: same
 Description: Development files (headers) for libzita-convolver library
  Zita convolver is a C++ library implementing a real-time
  convolution matrix for up to 64 inputs and outputs. It
@@ -34,6 +35,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: C++ library implementing a real-time convolution matrix
  Zita convolver is a C++ library implementing a real-time
  convolution matrix for up to 64 inputs and outputs. It
diff --git a/debian/libzita-convolver-dev.install b/debian/libzita-convolver-dev.install
index b341905..f3800aa 100644
--- a/debian/libzita-convolver-dev.install
+++ b/debian/libzita-convolver-dev.install
@@ -1,2 +1,2 @@
 usr/include/*
-usr/lib/lib*.so
+usr/lib/*/lib*.so
diff --git a/debian/libzita-convolver3.install b/debian/libzita-convolver3.install
index d0dbfd1..3ddde58 100644
--- a/debian/libzita-convolver3.install
+++ b/debian/libzita-convolver3.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 930ea33..efde4de 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -3,42 +3,39 @@ Description: Patch is applied because autotools are not used by upstream.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 ---
- libs/Makefile |   20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ libs/Makefile |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
 
-Index: zita-convolver/libs/Makefile
-===================================================================
---- zita-convolver.orig/libs/Makefile	2011-10-19 23:28:52.875896970 +0200
-+++ zita-convolver/libs/Makefile	2011-10-20 00:21:00.699815285 +0200
+--- zita-convolver.orig/libs/Makefile
++++ zita-convolver/libs/Makefile
 @@ -20,9 +20,9 @@
  
  # Modify as required.
  #
 -PREFIX = /usr/local
-+PREFIX = /usr
++PREFIX ?= /usr/local
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 -LIBDIR = lib$(SUFFIX)
-+LIBDIR = lib
++LIBDIR ?= lib$(SUFFIX)
  
  
  MAJVERS = 3
-@@ -32,8 +32,8 @@
+@@ -31,9 +31,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+ 
  
  CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O3
- CPPFLAGS += -ffast-math -funroll-loops 
+-CPPFLAGS += -ffast-math -funroll-loops 
 -CPPFLAGS += -march=native
 -CPPFLAGS += -DENABLE_VECTOR_MODE 
-+#CPPFLAGS += -march=native
-+#CPPFLAGS += -DENABLE_VECTOR_MODE 
++CPPFLAGS += -ffast-math -funroll-loops
  
  LDLFAGS += 
  LDLIBS +=
-@@ -56,7 +56,8 @@
+@@ -56,7 +54,7 @@ install:	$(ZITA-CONVOLVER_MIN)
  	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
  	install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
  	install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
 -	ldconfig
-+	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
 +	ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
  
  clean:
diff --git a/debian/rules b/debian/rules
index d9b8d76..eccb5d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export PREFIX=/usr
+export LIBDIR=lib/$(DEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 

-- 
zita-convolver packaging