[SCM] wavpack/master: Enable Multi-Arch support (Closes: #651017):

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c6883fca4acb6176c80c20208edceb6429435ada
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 5 10:46:11 2011 +0100

    Enable Multi-Arch support (Closes: #651017):
    
    - debian/{*.install,control,rules}: Update references and
      enable Multi-Arch: same. Patch from Becka Morgan.

diff --git a/debian/control b/debian/control
index 6bc1f06..992c61a 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>,
            Loic Minier <lool at dooz.org>
-Build-Depends: cdbs (>= 0.4.20),
-               debhelper (>= 6),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3~),
                dpkg-dev (>= 1.14.13)
 Standards-Version: 3.9.2
 Homepage: http://www.wavpack.com
@@ -14,7 +14,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/wavpack.git
 
 Package: libwavpack1
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: an audio codec (lossy and lossless) - library
diff --git a/debian/libwavpack-dev.install b/debian/libwavpack-dev.install
index aebd355..d00f1a0 100644
--- a/debian/libwavpack-dev.install
+++ b/debian/libwavpack-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libwavpack.so /usr/lib
-debian/tmp/usr/lib/libwavpack.a* /usr/lib
-debian/tmp/usr/include           /usr
-debian/tmp/usr/lib/pkgconfig     /usr/lib
+debian/tmp/usr/lib/*/libwavpack.so
+debian/tmp/usr/lib/*/libwavpack.a
+debian/tmp/usr/include
+debian/tmp/usr/lib/*/pkgconfig
diff --git a/debian/libwavpack1.install b/debian/libwavpack1.install
index 2710abb..4c0fd24 100644
--- a/debian/libwavpack1.install
+++ b/debian/libwavpack1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libwavpack.so.* /usr/lib
+debian/tmp/usr/lib/*/libwavpack.so.*
diff --git a/debian/rules b/debian/rules
index 452a52f..7695ada 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,3 +12,4 @@ DEB_DH_MAKESHLIBS_ARGS_libwavpack1 += -- -c4
 DEB_INSTALL_DOCS_ALL = 
 DEB_INSTALL_DOCS_libwavpack-dev = README
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
diff --git a/debian/wavpack.install b/debian/wavpack.install
index 50c452e..855bf7c 100644
--- a/debian/wavpack.install
+++ b/debian/wavpack.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/* /usr/bin
+debian/tmp/usr/bin
 debian/tmp/usr/share/man

-- 
wavpack packaging