From 1d0cbabafe01ff6a9c1d2e01d369d455e8aa183a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 19 Sep 2023 15:27:15 +0200 Subject: [PATCH] MT#58307 debian: Install shared libraries into multi-arch directories This makes it possible to mark the shared library packages as Multi-Arch same. Change-Id: I2d19bfbede5c77a1661858e787af1338885bdad4 --- debian/control | 1 + debian/ngcp-libtcap-dev.install | 2 +- debian/ngcp-libtcap1.install | 2 +- debian/rules | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 09e950d..3152624 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: Package: ngcp-libtcap1 Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends}, diff --git a/debian/ngcp-libtcap-dev.install b/debian/ngcp-libtcap-dev.install index e183cf9..146a603 100644 --- a/debian/ngcp-libtcap-dev.install +++ b/debian/ngcp-libtcap-dev.install @@ -1,2 +1,2 @@ usr/include -usr/lib/*.so +usr/lib/*/*.so diff --git a/debian/ngcp-libtcap1.install b/debian/ngcp-libtcap1.install index 093956b..3de3b10 100644 --- a/debian/ngcp-libtcap1.install +++ b/debian/ngcp-libtcap1.install @@ -1 +1 @@ -usr/lib/*.so.* +usr/lib/*/*.so.* diff --git a/debian/rules b/debian/rules index 5a414ec..c7fa821 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,10 @@ # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 +include /usr/share/dpkg/architecture.mk + export PREFIX = /usr +export LIBDIR = /usr/lib/$(DEB_HOST_MULTIARCH) %: dh $@