Convert to multiarch

Closes: #791492

diff --git a/debian/control b/debian/control
index e7c162ce26dc7e10a3311242a26e550524475418..ffcd96b28c151fdb7b9396ab1e7dafcbfd38b9bd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -75,6 +75,7 @@ Description: GPAC Project on Advanced Content - debugging symbols
 Package: gpac-modules-base
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Breaks:
  gpac (<= 0.4.5+svn3462~dfsg0-1~)
 Replaces:
@@ -95,6 +96,7 @@ Package: libgpac4
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}

diff --git a/debian/gpac-modules-base.install b/debian/gpac-modules-base.install
index caf071a0c3eb559c033d0435fc4b53c3e59d7ad1..ad19fdaab01eff211378019081e41bfc774e7013 100644 (file)
--- a/debian/gpac-modules-base.install
+++ b/debian/gpac-modules-base.install
@@ -1 +1 @@
-usr/lib/gpac
+usr/lib/*/gpac

diff --git a/debian/libgpac-dev.install b/debian/libgpac-dev.install
index 68ea53d10bec5a9824721ed543ce22f3e72b7f57..418619f82ba126d66da4259350d6953dabd28a70 100644 (file)
--- a/debian/libgpac-dev.install
+++ b/debian/libgpac-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/libgpac.so
-usr/lib/libgpac_static.a
+usr/lib/*/libgpac.so
+usr/lib/*/libgpac_static.a

diff --git a/debian/libgpac4.install b/debian/libgpac4.install
index bc40adc093e1bf59bd688927cb1f96d88fbd6e8f..8c21b71a0cb1628807f24e3f54a12afdd2413153 100644 (file)
--- a/debian/libgpac4.install
+++ b/debian/libgpac4.install
@@ -1 +1 @@
-usr/lib/libgpac.so.*
+usr/lib/*/libgpac.so.*

diff --git a/debian/rules b/debian/rules
index 61d2334787fcdd3961c15205d428466d578956db..588c99c90c9907bd8dcae7f8ce6f46f0318709f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,15 @@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 DEB_CONFIGURE_EXTRA_FLAGS = --disable-opt
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH
+
 %:
        dh $@ --parallel
 
 override_dh_auto_configure:
        dh_auto_configure -- \
            --prefix=/usr \
-           --libdir=lib \
+           --libdir=lib/$(DEB_HOST_MULTIARCH) \
            --mandir=\$${prefix}/share/man \
            --extra-cflags="-Wall -fPIC -DPIC -I/usr/include/mozjs -DXP_UNIX" \
            --enable-joystick \