[Pkg-phototools-devel] Bug#841444: please multiarch libilmbase-dev

[Helmut Grohne]

Package: libilmbase-dev
Version: 2.2.0-11
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:openexr

While the shared library is already multiarched, the development package
is not. Adding multiarch support to development is not generally
necessary, but it looks like openexr will need ilmbase for both
architectures for cross compiling as one of its build tools relies on
the half.h header. Thus please also multiarch libilmbase-dev. Consider
using the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru ilmbase-2.2.0/debian/changelog ilmbase-2.2.0/debian/changelog
--- ilmbase-2.2.0/debian/changelog
+++ ilmbase-2.2.0/debian/changelog
@@ -1,3 +1,11 @@
+ilmbase (2.2.0-11.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Multiarch libilmbase-dev by moving includes to a multiarch dir.
+    Closes: #-1
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 20 Oct 2016 19:51:27 +0200
+
 ilmbase (2.2.0-11) unstable; urgency=medium
 
   [ Mathieu Malaterre ]
diff --minimal -Nru ilmbase-2.2.0/debian/control ilmbase-2.2.0/debian/control
--- ilmbase-2.2.0/debian/control
+++ ilmbase-2.2.0/debian/control
@@ -39,6 +39,7 @@
 
 Package: libilmbase-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends:
  libilmbase12 (= ${binary:Version}),
diff --minimal -Nru ilmbase-2.2.0/debian/libilmbase-dev.install ilmbase-2.2.0/debian/libilmbase-dev.install
--- ilmbase-2.2.0/debian/libilmbase-dev.install
+++ ilmbase-2.2.0/debian/libilmbase-dev.install
@@ -1,3 +1,3 @@
 usr/lib/*/lib*.so
-usr/include/OpenEXR
+usr/include/*/OpenEXR
 usr/lib/*/pkgconfig/IlmBase.pc
diff --minimal -Nru ilmbase-2.2.0/debian/rules ilmbase-2.2.0/debian/rules
--- ilmbase-2.2.0/debian/rules
+++ ilmbase-2.2.0/debian/rules
@@ -6,7 +6,7 @@
 ##### VARIABLES
 #
 
-DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+include /usr/share/dpkg/architecture.mk
 #NO_MAKE_CHECK_ARCHS := arm
 NO_FAIL_ON_TESTSUITE_ERROR := i386
 
@@ -26,7 +26,7 @@
 override_dh_auto_configure:
 	PTHREAD_LIBS=-lpthread \
 		$(shell dpkg-buildflags --export=configure) \
-		dh_auto_configure -v
+		dh_auto_configure -v -- --includedir=/usr/include/$(DEB_HOST_MULTIARCH)
 
 # Need to disable the test suite on some architectures:
 override_dh_auto_test: