Bug#975355: libopenni2-0: missing Multi-Arch support

[Ahzo <ahzo@tutanota.com>]

Package: libopenni2-0
Version: 2.2.0.33+dfsg-13
Severity: normal
Tags: patch
Affects: gstreamer1.0-plugins-bad

Dear Maintainer,

recently gstreamer1.0-plugins-bad started depending on libopenni2-0. Since then that package is no longer multi-arch co-installable, because libopenni2-0 is not 'Multi-Arch: same'.

The first attached patch multi-archifies openni2 to fix this.

The second, optional, patch fixes parallel-build support for openni2 to improve build-time.

Please include at least the first patch in your next upload, to make gstreamer1.0-plugins-bad again multi-arch co-installable.

Thanks in advance,
Ahzo

>From e82c6d4aca383258c829700ac45782a24ba080bd Mon Sep 17 00:00:00 2001
From: Ahzo <Ahzo@tutanota.com>
Date: Fri, 20 Nov 2020 22:14:05 +0100
Subject: [PATCH 1/2] multi-archify the library

Switch to debhelper-compat 13 for support of DEB_HOST_MULTIARCH in the
install files.
---
 debian/control                | 5 ++++-
 debian/libopenni2-0.install   | 4 ++--
 debian/libopenni2-dev.install | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index a0c8157..7aa47a5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: libs
 Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders: Nobuhiro Iwamatsu <iwamatsu@debian.org>,
            Jochen Sprickerhof <jspricke@debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                freeglut3-dev,
                libusb-1.0-0-dev,
                python3,
@@ -21,6 +21,7 @@ Vcs-Browser: https://salsa.debian.org/multimedia-team/openni2
 
 Package: libopenni2-0
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: framework for sensor-based 'Natural Interaction'
@@ -34,6 +35,7 @@ Description: framework for sensor-based 'Natural Interaction'
 Package: openni2-utils
 Section: utils
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: debug and test utilities OpenNI2 framework
@@ -50,6 +52,7 @@ Description: debug and test utilities OpenNI2 framework
 Package: libopenni2-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          libopenni2-0 (= ${binary:Version})
 Suggests: openni2-doc
diff --git a/debian/libopenni2-0.install b/debian/libopenni2-0.install
index 7258244..89fcb95 100644
--- a/debian/libopenni2-0.install
+++ b/debian/libopenni2-0.install
@@ -1,3 +1,3 @@
-Bin/*-Release/libOpenNI2.so.* usr/lib/
-Bin/*-Release/OpenNI2/Drivers/lib*.so.* usr/lib/OpenNI2/Drivers/
+Bin/*-Release/libOpenNI2.so.* usr/lib/${DEB_HOST_MULTIARCH}
+Bin/*-Release/OpenNI2/Drivers/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}/OpenNI2/Drivers/
 Config/*.ini etc/openni2/
diff --git a/debian/libopenni2-dev.install b/debian/libopenni2-dev.install
index 43f895c..aad904e 100644
--- a/debian/libopenni2-dev.install
+++ b/debian/libopenni2-dev.install
@@ -1,4 +1,4 @@
 Include/* usr/include/openni2/
 debian/libopenni2.pc usr/share/pkgconfig
-Bin/*-Release/libOpenNI2.so usr/lib/
-Bin/*-Release/OpenNI2/Drivers/lib*.so usr/lib/OpenNI2/Drivers/
+Bin/*-Release/libOpenNI2.so usr/lib/${DEB_HOST_MULTIARCH}
+Bin/*-Release/OpenNI2/Drivers/lib*.so usr/lib/${DEB_HOST_MULTIARCH}/OpenNI2/Drivers/
-- 
2.29.2

>From d07e71e869150026834b138c00f2043d3be7dfd9 Mon Sep 17 00:00:00 2001
From: Ahzo <Ahzo@tutanota.com>
Date: Fri, 20 Nov 2020 22:14:46 +0100
Subject: [PATCH 2/2] use dh_auto_build to properly support parallel builds

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 57ccdd3..194df62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh $@ --buildsystem=makefile
 
 override_dh_auto_build:
-	make ALLOW_WARNINGS=1
+	dh_auto_build -- ALLOW_WARNINGS=1
 	cd Source/Documentation && python3 ./Runme.py
 	cd Bin/*-Release/ && mv NiViewer NiViewer2
 
-- 
2.29.2