summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-12-10 15:27:41 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-12-10 15:27:41 +0100
commit7771106fa4afce593ef32504c223d0da2b2fe465 (patch)
treece2fd4bf0ffe4dc815d38804f7f68d9ae2d73020
parent134e9e1cec6e5569030940a458ba1a80f0cffc08 (diff)
downloadtde-packaging-7771106f.tar.gz
tde-packaging-7771106f.zip
DEB tqtinterface: Install libraries according to multi-arch rules
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 44d0ade8a744850f7fe719b7e884e49920d34fa7)
-rw-r--r--debian/_base/dependencies/tqtinterface/debian/control4
-rwxr-xr-xdebian/_base/dependencies/tqtinterface/debian/rules1
-rw-r--r--ubuntu/_base/dependencies/tqtinterface/debian/control3
-rwxr-xr-xubuntu/_base/dependencies/tqtinterface/debian/rules1
4 files changed, 9 insertions, 0 deletions
diff --git a/debian/_base/dependencies/tqtinterface/debian/control b/debian/_base/dependencies/tqtinterface/debian/control
index 9000f3df6..4bd9ab301 100644
--- a/debian/_base/dependencies/tqtinterface/debian/control
+++ b/debian/_base/dependencies/tqtinterface/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
Package: libtqtinterface
Architecture: any
+Multi-Arch: same
Section: libs
Replaces: libtqtinterface (<< 4:14.0.0~)
Breaks: libtqtinterface (<< 4:14.0.0~)
@@ -19,6 +20,7 @@ Description: The Trinity Qt Interface Libraries
Package: libtqtinterface-dev
Architecture: all
+Multi-Arch: foreign
Section: libs
Replaces: libtqtinterface-dev (<< 4:14.0.0~)
Breaks: libtqtinterface-dev (<< 4:14.0.0~)
@@ -31,6 +33,7 @@ Description: The Trinity Qt Interface Libraries (Development Files)
Package: libtqtinterface-doc
Architecture: all
+Multi-Arch: foreign
Section: libs
Replaces: libtqtinterface-doc (<< 4:14.0.0~)
Breaks: libtqtinterface-doc (<< 4:14.0.0~)
@@ -43,6 +46,7 @@ Description: The Trinity Qt Interface Libraries (Debug Files)
Package: libtqtinterface-dbg
Architecture: any
+Multi-Arch: same
Section: libs
Replaces: libtqtinterface-dbg (<< 4:14.0.0~)
Breaks: libtqtinterface-dbg (<< 4:14.0.0~)
diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules
index 1b9c978a0..530f77b52 100755
--- a/debian/_base/dependencies/tqtinterface/debian/rules
+++ b/debian/_base/dependencies/tqtinterface/debian/rules
@@ -6,6 +6,7 @@ include debian/cdbs/debian-tde.mk
version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/control b/ubuntu/_base/dependencies/tqtinterface/debian/control
index 9000f3df6..16aa3485a 100644
--- a/ubuntu/_base/dependencies/tqtinterface/debian/control
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.8.4
Package: libtqtinterface
Architecture: any
+Multi-Arch: same
Section: libs
Replaces: libtqtinterface (<< 4:14.0.0~)
Breaks: libtqtinterface (<< 4:14.0.0~)
@@ -31,6 +32,7 @@ Description: The Trinity Qt Interface Libraries (Development Files)
Package: libtqtinterface-doc
Architecture: all
+Multi-Arch: foreign
Section: libs
Replaces: libtqtinterface-doc (<< 4:14.0.0~)
Breaks: libtqtinterface-doc (<< 4:14.0.0~)
@@ -43,6 +45,7 @@ Description: The Trinity Qt Interface Libraries (Debug Files)
Package: libtqtinterface-dbg
Architecture: any
+Multi-Arch: same
Section: libs
Replaces: libtqtinterface-dbg (<< 4:14.0.0~)
Breaks: libtqtinterface-dbg (<< 4:14.0.0~)
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index 1b9c978a0..530f77b52 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
@@ -6,6 +6,7 @@ include debian/cdbs/debian-tde.mk
version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \