[SCM] libass/master: Build with Multiarch support.

[alessio at users.alioth.debian.org]

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

    Build with Multiarch support.

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 0df2544..e7e01b8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libass
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: debhelper (>= 7), 
+Build-Depends: debhelper (>= 8.1.3~),
                libfreetype6-dev,
                libenca-dev,
                libfontconfig1-dev,
@@ -16,6 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libass.git
 Package: libass-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libass4 (= ${binary:Version}),
          libenca-dev,
          libfreetype6-dev,
@@ -31,6 +32,8 @@ Description: development files for libass
 
 Package: libass4
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: library for SSA/ASS subtitles rendering
  SubStation Alpha (SSA) is a subtitle file format that allows more
diff --git a/debian/libass-dev.install b/debian/libass-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/libass-dev.install
+++ b/debian/libass-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libass4.install b/debian/libass4.install
index d0dbfd1..3ddde58 100644
--- a/debian/libass4.install
+++ b/debian/libass4.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 2d75130..3c8d4d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -16,7 +17,8 @@ CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
 CONFFLAGS = $(CROSS) 
-CONFFLAGS += --prefix=/usr --mandir=\$${prefix}/share/man 
+CONFFLAGS += --prefix=/usr --mandir=\$${prefix}/share/man \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 CONFFLAGS += CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 
 config.status: configure

-- 
LibASS packaging