[SCM] fluidsynth/master: Build with MultiArch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b24625ab84f0732716f11b71ca9d05901b7edd9c
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 24 19:08:56 2012 +0100

    Build with MultiArch.

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 8abc2e3..c883995 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  David Henningsson <diwic at ubuntu.com>
 Build-Depends:
  cmake,
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3~),
  ladspa-sdk,
  libasound2-dev,
  libglib2.0-dev (>= 2.6.5),
@@ -39,6 +39,8 @@ Description: Real-time MIDI software synthesizer
 
 Package: libfluidsynth1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Real-time MIDI software synthesizer (runtime library)
@@ -50,12 +52,12 @@ Description: Real-time MIDI software synthesizer (runtime library)
  This package contains the runtime library.
 
 Package: libfluidsynth-dev
-Architecture: all
+Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends:
  libasound2-dev,
- libfluidsynth1 (<< ${source:Upstream-Version}+1~),
- libfluidsynth1 (>= ${source:Version}),
+ libfluidsynth1 (= ${binary:Version}),
  libglib2.0-dev (>= 2.6.5),
  libjack-dev | libjack-jackd2-dev,
  libncurses5-dev | libncurses-dev,
diff --git a/debian/libfluidsynth-dev.install b/debian/libfluidsynth-dev.install
index 1cfae64..f9916a5 100644
--- a/debian/libfluidsynth-dev.install
+++ b/debian/libfluidsynth-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/libfluidsynth.so
-usr/lib/pkgconfig/fluidsynth.pc
+usr/lib/*/libfluidsynth.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libfluidsynth1.install b/debian/libfluidsynth1.install
index 46b2d14..dbd360f 100644
--- a/debian/libfluidsynth1.install
+++ b/debian/libfluidsynth1.install
@@ -1 +1 @@
-usr/lib/libfluidsynth.so.*
+usr/lib/*/libfluidsynth.so.*
diff --git a/debian/rules b/debian/rules
index ced0b46..c06755c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,13 @@ LDFLAGS+=-Wl,--as-needed
 ifneq ($(findstring $(DEB_HOST_ARCH_OS),kfreebsd hurd),)
 EXTRA_CONFIGURE_ARGS += -Denable-alsa=off -Denable-dbus=off
 endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ -Scmake --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DLIB_SUFFIX='' \
+		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
 		-Denable-ladspa=on \
 		$(EXTRA_CONFIGURE_ARGS)

-- 
fluidsynth packaging