[SCM] libmpc/master: Build for Multiarch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fc470370fca8b8f525d3818790f05d09f9a8ed08
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 14 23:47:15 2012 +0100

    Build for 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 f9ad484..434b49b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>,
            Jorge Salamero Sanz <bencer at cauterized.net>
-Build-Depends: cdbs (>= 0.4.20),
-               debhelper (>= 7),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                pkg-config,
                libreplaygain-dev (>= 1.0~r412),
                libcue-dev
@@ -16,7 +16,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libmpc.git
 
 Package: libmpcdec6
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: MusePack decoder - library
@@ -31,6 +33,7 @@ Description: MusePack decoder - library
 
 Package: libmpcdec-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libmpcdec6 (= ${binary:Version}),
          ${misc:Depends}
@@ -49,7 +52,6 @@ Description: MusePack decoder - development files
 
 Package: musepack-tools
 Architecture: any
-Section: sound
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: MusePack commandline utilities
diff --git a/debian/libmpcdec-dev.install b/debian/libmpcdec-dev.install
index 1de0637..b3a1eee 100644
--- a/debian/libmpcdec-dev.install
+++ b/debian/libmpcdec-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/libmpcdec.so
-debian/tmp/usr/lib/libmpcdec.a
+usr/include
+usr/lib/*/libmpcdec.so
+usr/lib/*/libmpcdec.a
diff --git a/debian/libmpcdec6.install b/debian/libmpcdec6.install
index 805a5af..47d7029 100644
--- a/debian/libmpcdec6.install
+++ b/debian/libmpcdec6.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libmpcdec.so.*
+usr/lib/*/libmpcdec.so.*
diff --git a/debian/musepack-tools.install b/debian/musepack-tools.install
index 451ddc0..e772481 100644
--- a/debian/musepack-tools.install
+++ b/debian/musepack-tools.install
@@ -1 +1 @@
-debian/tmp/usr/bin
+usr/bin
diff --git a/debian/rules b/debian/rules
index 181f790..8fdcd91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 common-binary-post-install-arch:: list-missing
 
 DEB_DH_MAKESHLIBS_ARGS_libmpcdec6 := -V 'libmpcdec6 (>= 1:0.1~r435)'
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-mpcchap
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 

-- 
libmpc packaging