[SCM] gpac/master: Attempt to build with MultiArch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3483cc70d3a40eae25f45a962ec9deb9f26d170f
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 3 16:36:32 2012 +0100

    Attempt to build with 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 a71b950..af8cb09 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://gpac.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/gpac.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gpac.git
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  freeglut3-dev,
  liba52-0.7.4-dev,
  libasound2-dev,
@@ -49,7 +49,9 @@ Description: GPAC Project on Advanced Content - utilities
 
 Package: libgpac1
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GPAC Project on Advanced Content - shared libraries
  GPAC stands for GPAC Project on Advanced Content (a recursive acronym). It is
@@ -63,6 +65,7 @@ Description: GPAC Project on Advanced Content - shared libraries
 Package: libgpac-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: libgpac1 (= ${binary:Version}), ${misc:Depends}
 Replaces: gpac (<= 0.4.2~rc2-0ubuntu1)
 Description: GPAC Project on Advanced Content - development files
diff --git a/debian/libgpac-dev.install b/debian/libgpac-dev.install
index 8612bf8..25275c6 100644
--- a/debian/libgpac-dev.install
+++ b/debian/libgpac-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/libgpac_static.a
-usr/lib/libgpac.so
+usr/lib/*/libgpac_static.a
+usr/lib/*/libgpac.so
diff --git a/debian/libgpac1.install b/debian/libgpac1.install
index bc40adc..8c21b71 100644
--- a/debian/libgpac1.install
+++ b/debian/libgpac1.install
@@ -1 +1 @@
-usr/lib/libgpac.so.*
+usr/lib/*/libgpac.so.*
diff --git a/debian/rules b/debian/rules
index 737fa11..c9f5f1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,13 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man \
+	--libdir=lib/$(DEB_HOST_MULTIARCH) \
 	--extra-cflags="-Wall -fPIC -DPIC -I/usr/include/mozjs -DXP_UNIX" \
 	--enable-joystick --disable-ssl
 	echo "#define GPAC_SVN_REVISION	\"\"" >include/gpac/version.h

-- 
gpac packaging