Bug#941114: multiarchify libntl35

[Helmut Grohne]

Package: libntl35
Version: 10.5.0-2
Tags: patch
User: debian-cross at lists.debian.org
Usertags: cross-satisfiability
Control: affects -1 + src:sagemath src:singular

The affected packages fail to satisfy their cross Build-Depends, because
they need libntl35 for both the build architecture and the host
architecture. In order to allow that, libntl35 must be marked
Multi-Arch: same (or foreign, but that doesn't make sense here). The
attached patch implements that. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru ntl-10.5.0/debian/changelog ntl-10.5.0/debian/changelog
--- ntl-10.5.0/debian/changelog	2018-01-05 15:47:20.000000000 +0100
+++ ntl-10.5.0/debian/changelog	2019-09-25 06:24:04.000000000 +0200
@@ -1,3 +1,10 @@
+ntl (10.5.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Multiarchify libntl35. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 25 Sep 2019 06:24:04 +0200
+
 ntl (10.5.0-2) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru ntl-10.5.0/debian/control ntl-10.5.0/debian/control
--- ntl-10.5.0/debian/control	2018-01-03 12:30:44.000000000 +0100
+++ ntl-10.5.0/debian/control	2019-09-25 06:24:04.000000000 +0200
@@ -11,6 +11,7 @@
 
 Package: libntl35
 Architecture: any
+Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --minimal -Nru ntl-10.5.0/debian/libntl-dev.install ntl-10.5.0/debian/libntl-dev.install
--- ntl-10.5.0/debian/libntl-dev.install	2017-08-31 11:50:39.000000000 +0200
+++ ntl-10.5.0/debian/libntl-dev.install	2019-09-25 06:24:04.000000000 +0200
@@ -1,3 +1,3 @@
 usr/include/NTL/*.h
-usr/lib/*.so
-usr/lib/*.a
+usr/lib/*/*.so
+usr/lib/*/*.a
diff --minimal -Nru ntl-10.5.0/debian/libntl35.install ntl-10.5.0/debian/libntl35.install
--- ntl-10.5.0/debian/libntl35.install	2017-08-31 11:50:39.000000000 +0200
+++ ntl-10.5.0/debian/libntl35.install	2019-09-25 06:24:04.000000000 +0200
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --minimal -Nru ntl-10.5.0/debian/rules ntl-10.5.0/debian/rules
--- ntl-10.5.0/debian/rules	2017-10-19 20:58:09.000000000 +0200
+++ ntl-10.5.0/debian/rules	2019-09-25 06:24:03.000000000 +0200
@@ -3,6 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/architecture.mk
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
@@ -17,6 +18,7 @@
 		SHARED=on NATIVE=off \
 		CPPFLAGS='$(CPPFLAGS)' CXXFLAGS='$(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' \
 		DEF_PREFIX='/usr' \
+		LIBDIR='$$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)'
 		NTL_GMP_LIP=on SHARED=on \
 		NTL_GF2X_LIB=on \
 		TUNE=generic