Attempt to build with MultiArch.

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index a71b95058fe1c50122786fb6a3b998a406c336f7..af8cb09f6d50f6f4e689bdc94aa2ae910790dd7e 100644 (file)
--- 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 8612bf84933cebaf3a51d9f4b9cc2106b1368300..25275c6fda340a84f26e5920e035fe666899a279 100644 (file)
--- 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 bc40adc093e1bf59bd688927cb1f96d88fbd6e8f..8c21b71a0cb1628807f24e3f54a12afdd2413153 100644 (file)
--- 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 737fa112bac0c6e7d56fdbfb8b2f0d82796968dd..c9f5f1d374228ca681fda8b9b3e22c003bc9eebe 100755 (executable)
--- 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