[SCM] libreplaygain/master: Multiarch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 295b0efbc42049f6ec91c5493ec68cf1095aabd4
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 15 15:20:19 2012 +0100

    Multiarch support.

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index f0570e9..ab6fce1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Sebastian Dröge <slomo at debian.org>,
            Jorge Salamero Sanz <bencer at cauterized.net>
 Build-Depends: automake,
                dh-autoreconf,
-               cdbs (>= 0.4.20),
-               debhelper (>= 5),
+               cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                libtool
 Standards-Version: 3.9.2
 Homepage: http://www.replaygain.org
@@ -16,6 +16,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libreplaygain.git
 
 Package: libreplaygain1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -29,6 +31,7 @@ Description: Calculate ReplayGain information - library
 Package: libreplaygain-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: libreplaygain1 (= ${binary:Version}),
          ${misc:Depends}
 Description: Calculate ReplayGain information - development files
diff --git a/debian/libreplaygain-dev.install b/debian/libreplaygain-dev.install
index af09556..70db461 100644
--- a/debian/libreplaygain-dev.install
+++ b/debian/libreplaygain-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/libreplaygain.a
-debian/tmp/usr/lib/libreplaygain.so
+usr/include
+usr/lib/*/libreplaygain.a
+usr/lib/*/libreplaygain.so
diff --git a/debian/libreplaygain1.install b/debian/libreplaygain1.install
index 69fa1cb..88fe0dd 100644
--- a/debian/libreplaygain1.install
+++ b/debian/libreplaygain1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libreplaygain.so.*
+usr/lib/*/libreplaygain.so.*
diff --git a/debian/rules b/debian/rules
index 6c27e8b..f0d4619 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,6 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 common-binary-post-install-arch:: list-missing

-- 
libreplaygain packaging