Control: tags -1 + patch

On Mon, 30 May 2022 at 17:33:37 +0100, Simon McVittie wrote:
> On Sat, 24 Aug 2019 at 11:43:35 +0100, Simon McVittie wrote:
> > libopusfile0 and libopusfile-dev are not Multi-Arch co-installable
> 
> This is still the case as of 0.12-1: Helmut's patch from #899138 has
> been applied but my follow-up has not. I'll send a tested patch when I
> have one (I need to fix this for the Steam Runtime anyway).

Please see
https://salsa.debian.org/multimedia-team/opusfile/-/merge_requests/1
or the attached patches.

Thanks,
    smcv
>From 68a8160c1a6a3a5f4e8b54a70b94a2eb762c674f Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Wed, 19 Dec 2018 19:42:35 +0000
Subject: [PATCH 1/2] Mark libopusfile0, libopusfile-dev as Multi-Arch: same

This builds on Helmut Grohne's work in #899138 to allow (for example)
libopusfile-dev:amd64 and libopusfile-dev:s390x to be co-installed,
making it possible to do cross-builds without either using a chroot
or removing the host architecture's libopusfile.

Closes: #935590
Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 4d27a6e..d856d47 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Vcs-Browser: https://salsa.debian.org/multimedia-team/opusfile
 Package: libopusfile0
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -41,6 +42,7 @@ Description: High-level API for basic manipulation of Ogg Opus audio streams
 Package: libopusfile-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libogg-dev (>= 1.3.0),
  libopus-dev (>= 1.0.1),
-- 
2.36.1

>From 2d10b227c83c75d6230b247deed1e15e0779d29a Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Mon, 30 May 2022 17:40:19 +0100
Subject: [PATCH 2/2] d/control: Mark libopusfile-doc as Multi-Arch: foreign

Signed-off-by: Simon McVittie <s...@debian.org>
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index d856d47..ae488cf 100644
--- a/debian/control
+++ b/debian/control
@@ -65,6 +65,7 @@ Description: development files for libopusfile
 Package: libopusfile-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Suggests:
-- 
2.36.1

Reply via email to