From 7771106fa4afce593ef32504c223d0da2b2fe465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 10 Dec 2021 15:27:41 +0100 Subject: [PATCH] DEB tqtinterface: Install libraries according to multi-arch rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 44d0ade8a744850f7fe719b7e884e49920d34fa7) --- debian/_base/dependencies/tqtinterface/debian/control | 4 ++++ debian/_base/dependencies/tqtinterface/debian/rules | 1 + ubuntu/_base/dependencies/tqtinterface/debian/control | 3 +++ ubuntu/_base/dependencies/tqtinterface/debian/rules | 1 + 4 files changed, 9 insertions(+) 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" \