[SCM] libbluray/master: Update this package so it supports multiarch.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f8bff4e34bee2008c6367e5fd40761a9cb99eb98
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Oct 1 17:44:20 2011 -0400

    Update this package so it supports 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 85154de..6447e5d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Andres Mejia <amejia at debian.org>,
  Reinhard Tartler <siretart at tauware.de>,
  Alessio Treglia <alessio at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
                javahelper,
                openjdk-6-jdk [linux-any],
                ant,
@@ -42,6 +42,8 @@ Description: Blu-ray disc playback support library (development files)
 
 Package: libbluray1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libbluray-bdj, libaacs0
 Description: Blu-ray disc playback support library (shared library)
diff --git a/debian/libbluray-dev.install b/debian/libbluray-dev.install
index 089d4d9..52fa01a 100644
--- a/debian/libbluray-dev.install
+++ b/debian/libbluray-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/libbluray.so
-usr/lib/pkgconfig
+usr/lib/*/libbluray.so
+usr/lib/*/pkgconfig
diff --git a/debian/libbluray1.install b/debian/libbluray1.install
index 61481a0..5b84f82 100644
--- a/debian/libbluray1.install
+++ b/debian/libbluray1.install
@@ -1 +1 @@
-usr/lib/libbluray.so.*
+usr/lib/*/libbluray.so.*
diff --git a/debian/rules b/debian/rules
index 552b59e..5de6fc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-confflags := --enable-doxygen-doc
+confflags := --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-doxygen-doc
 
 # enable bdjava on linux hosts only
 ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..25241eb
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Ignore this, since currently only debhelper (>= 8.1.3~) is needed.
+package-needs-versioned-debhelper-build-depends 9

-- 
libbluray packaging