[SCM] suil/master: Port to Multi-Arch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 02ba287653582692545a456be8215eb52a5fbff8
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 5 02:31:06 2012 +0200

    Port to Multi-Arch.

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 50810fd..2d6b3ae 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,14 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/suil.git
 
 Package: libsuil-dev
 Section: libdevel
-Architecture: all
+Architecture: any
 Depends:
  libsuil-0-0 (<< ${source:Upstream-Version}+1~),
  libsuil-0-0 (>= ${source:Version}),
  ${misc:Depends}
 Recommends:
  pkg-config
+Multi-Arch: same
 Description: Development files for suil
  Suil makes it possible to load a UI of any toolkit in a host using
  any other toolkit (assuming the toolkits are both supported by
@@ -40,9 +41,11 @@ Description: Development files for suil
 
 Package: libsuil-0-0
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
 Description: library for loading and wrapping LV2 plugin UIs
  Suil makes it possible to load a UI of any toolkit in a host using
  any other toolkit (assuming the toolkits are both supported by
diff --git a/debian/libsuil-0-0.install b/debian/libsuil-0-0.install
index 093956b..3de3b10 100644
--- a/debian/libsuil-0-0.install
+++ b/debian/libsuil-0-0.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libsuil-dev.install b/debian/libsuil-dev.install
index 9d4598d..90d8c98 100644
--- a/debian/libsuil-dev.install
+++ b/debian/libsuil-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index d8b9c43..6071cdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LDFLAGS+=-Wl,--as-needed
 WAF = ./waf
 
@@ -10,6 +11,7 @@ override_dh_auto_configure:
 	$(WAF) configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
                 --strict \
 		--debug
 

-- 
suil packaging