Don't install modules in multi-arch directories, Closes: #730497

The code just doesn't look into the right directories

diff --git a/debian/control b/debian/control
index 706d209bbe014a614da08e36fb661b0585a8b172..0d15f41d09897c0d65b86b48602bdd263c2d6d98 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -73,7 +73,6 @@ Description: GPAC Project on Advanced Content - debugging symbols
 
 Package: gpac-modules-base
 Architecture: any
-Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Breaks:
  gpac (<= 0.4.5+svn3462~dfsg0-1~)
@@ -93,7 +92,6 @@ Description: GPAC Project on Advanced Content - modules
 
 Package: libgpac2
 Architecture: any
-Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
@@ -112,7 +110,6 @@ Package: libgpac-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Multi-Arch: same
 Depends:
  libgpac2 (= ${binary:Version}),
  ${misc:Depends}
@@ -127,7 +124,6 @@ Description: GPAC Project on Advanced Content - debugging symbols for libgpac2
 Package: libgpac-dev
 Architecture: any
 Section: libdevel
-Multi-Arch: same
 Depends:
  libgpac2 (= ${binary:Version}),
  ${misc:Depends}

diff --git a/debian/gpac-modules-base.install b/debian/gpac-modules-base.install
index ad19fdaab01eff211378019081e41bfc774e7013..caf071a0c3eb559c033d0435fc4b53c3e59d7ad1 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 418619f82ba126d66da4259350d6953dabd28a70..68ea53d10bec5a9824721ed543ce22f3e72b7f57 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/libgpac2.install b/debian/libgpac2.install
index 8c21b71a0cb1628807f24e3f54a12afdd2413153..bc40adc093e1bf59bd688927cb1f96d88fbd6e8f 100644 (file)
--- a/debian/libgpac2.install
+++ b/debian/libgpac2.install
@@ -1 +1 @@
-usr/lib/*/libgpac.so.*
+usr/lib/libgpac.so.*

diff --git a/debian/rules b/debian/rules
index 72513d65b91a9bc938b1f24ca4896979a534d3f2..93609a968131da7e52e71dd137b80cd210f00fac 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 export REPACK_SH=$(CURDIR)/debian/repack.sh
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export GPAC_BASE_VER ?= $(shell dpkg-parsechangelog | sed -n 's/Version: \([0-9.]*\)\+.*/\1/p')
 export GPAC_SVN_REVISION ?= $(shell dpkg-parsechangelog | grep Version | sed 's/Version:.*+svn\([0-9]\+\).*/\1/')
 
@@ -16,8 +15,8 @@ endif
 override_dh_auto_configure:
        dh_auto_configure -- \
            --prefix=/usr \
+           --libdir=lib \
            --mandir=\$${prefix}/share/man \
-           --libdir=lib/$(DEB_HOST_MULTIARCH) \
            --extra-cflags="-Wall -fPIC -DPIC -I/usr/include/mozjs -DXP_UNIX" \
            --enable-joystick \
            --enable-debug \
@@ -25,13 +24,8 @@ override_dh_auto_configure:
            $(DEB_EXTRA_CONFIGURE_FLAGS)
 
 override_dh_auto_install:
-       $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr \
-               moddir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gpac
+       $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
        $(MAKE) install-lib prefix=$(CURDIR)/debian/tmp/usr
-       # Move the arch-specific headers into the multiarch path
-       cd debian/tmp/usr/include && \
-       mkdir -p $(DEB_HOST_MULTIARCH)/gpac && \
-       mv gpac/configuration.h $(DEB_HOST_MULTIARCH)/gpac/
        mv debian/tmp/usr/share/man/man1/mp4box.1 \
                debian/tmp/usr/share/man/man1/MP4Box.1
        mv debian/tmp/usr/share/man/man1/mp4client.1 \