[SCM] gpac/master: Convert to multiarch
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Wed Jul 8 08:05:20 UTC 2015
The following commit has been merged in the master branch:
commit e3c20c360725535ff80afa83e6bc2063a4f1385a
Author: Balint Reczey <balint at balintreczey.hu>
Date: Tue Jul 7 16:36:51 2015 -0700
Convert to multiarch
Closes: #791492
diff --git a/debian/control b/debian/control
index e7c162c..ffcd96b 100644
--- 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 caf071a..ad19fda 100644
--- 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 68ea53d..418619f 100644
--- 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 bc40adc..8c21b71 100644
--- 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 61d2334..588c99c 100755
--- 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 \
--
gpac packaging
More information about the pkg-multimedia-commits
mailing list