Merge ~mkukri/ubuntu/+source/imath:merge into ubuntu/+source/imath:debian/sid

[Mate Kukri]

(Second try) Merge with Debian sid, now actually builds :-)

[Simon Quigley (tsimonq2)]

 _____________________
| _________________ |
| | 0. | |
| |_________________| |
| ___ ___ ___ ___ |
| | 7 | 8 | 9 | | + | |
| |___|___|___| |___| |
| | 4 | 5 | 6 | | - | |
| |___|___|___| |___| |
| | 1 | 2 | 3 | | x | |
| |___|___|___| |___| |
| | . | 0 | = | | / | |
| |___|___|___| |___| |
|_____________________|

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 9e27225..e1a0504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+imath (3.1.9-3ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Don't build python3-imath on i386
+
+ -- Mate Kukri <[e-mail]>  Tue, 28 Nov 2023 09:48:52 +0000
+
 imath (3.1.9-3) unstable; urgency=medium
 
   * debian/control: add python3-imath as dep to -dev
@@ -18,6 +25,13 @@ imath (3.1.9-1) unstable; urgency=medium
 
  -- Matteo F. Vescovi <[e-mail]>  Sat, 19 Aug 2023 00:24:19 +0200
 
+imath (3.1.6-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + Don't build python3-imath on i386
+
+ -- Graham Inggs <[e-mail]>  Sat, 11 Feb 2023 06:56:53 +0000
+
 imath (3.1.6-1) unstable; urgency=medium
 
   * New upstream release
@@ -25,6 +39,24 @@ imath (3.1.6-1) unstable; urgency=medium
 
  -- Matteo F. Vescovi <[e-mail]>  Sat, 21 Jan 2023 15:17:19 +0100
 
+imath (3.1.5-1ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild with Python 3.11 as default
+
+ -- Graham Inggs <[e-mail]>  Sun, 25 Dec 2022 19:21:36 +0000
+
+imath (3.1.5-1ubuntu2) kinetic; urgency=medium
+
+  * No-change rebuild to pick up fixed libboost-python dependencies
+
+ -- Graham Inggs <[e-mail]>  Sat, 03 Sep 2022 13:10:14 +0000
+
+imath (3.1.5-1ubuntu1) kinetic; urgency=medium
+
+  * Don't build python3-imath on i386.
+
+ -- Steve Langasek <[e-mail]>  Sun, 21 Aug 2022 05:53:07 +0000
+
 imath (3.1.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c5a499a..cb0a4b6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,21 @@
 Source: imath
 Section: libs
 Priority: optional
-Maintainer: Debian PhotoTools Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PhotoTools Maintainers <[e-mail]>
 Uploaders: Matteo F. Vescovi <[e-mail]>
 Build-Depends:
  cmake,
  debhelper-compat (= 13),
- dh-python,
+ dh-python [!i386],
  doxygen,
- libboost-python-dev,
+ libboost-python-dev [!i386],
  pkg-config,
- python3-breathe,
- python3-dev:any,
- python3-numpy,
- python3-sphinx,
- python3-sphinx-press-theme
+ python3-breathe [!i386],
+ python3-dev:any [!i386],
+ python3-numpy [!i386],
+ python3-sphinx [!i386],
+ python3-sphinx-press-theme [!i386]
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://www.openexr.com
diff --git a/debian/rules b/debian/rules
index ca3a3a5..dbcf8ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,24 @@
 #! /usr/bin/make -f
 
+pkg_lib = libimath-3-1-29
+pkg_dev = libimath-dev
+pkg_doc = libimath-doc
+pkg_py  = python3-imath
+
 export DH_OPTIONS
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq ($(DEB_HOST_ARCH), i386)
+    witharg = --with python3
+    cmake_python = -DPYTHON=ON
+endif
+
 INSTDIR = debian/tmp
 
 %:
-	dh $@ -Bbuild -Scmake --with python3
+	dh $@ -Bbuild -Scmake $(witharg)
 
 ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
   BUILDDOC = OFF
@@ -18,7 +30,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DBUILD_DOCS=$(BUILDDOC) \
 		-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON \
-		-DPYTHON=ON
+		$(cmake_python)
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
@@ -40,4 +52,26 @@ override_dh_install-indep:
 	rm -f $(INSTDIR)/usr/share/doc/Imath/sphinx/_static/underscore.js
 	rm -f $(INSTDIR)/usr/share/doc/Imath/sphinx/.buildinfo
 	rm -rf $(INSTDIR)/usr/share/doc/Imath/sphinx/.doctrees
-	dh_install
+	dh_install -p$(pkg_doc) usr/share/doc/Imath/sphinx/* usr/share/doc/libimath-doc/html
+
+override_dh_install-arch:
+	# See #1004067
+	sed -i -e "s/FATAL_ERROR/STATUS/g" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Imath/ImathConfig.cmake
+	sed -i -e "s/FATAL_ERROR/STATUS/g" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Imath/ImathTargets.cmake
+ifneq ($(DEB_HOST_ARCH), i386)
+	dh_numpy3 --package=$(pkg_py)
+endif
+	dh_install -p$(pkg_lib) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libImath-3_1.so.29.8.0
+	dh_install -p$(pkg_lib) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libImath-3_1.so.29
+	dh_install -p$(pkg_dev) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libImath-3_1.so
+	dh_install -p$(pkg_dev) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libImath.so
+	dh_install -p$(pkg_dev) debian/tmp/usr/include
+	dh_install -p$(pkg_dev) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/
+	dh_install -p$(pkg_dev) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
+ifneq ($(DEB_HOST_ARCH), i386)
+	dh_install -p$(pkg_py)  debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libPyImath_Python3_*-3_1.so
+	dh_install -p$(pkg_py)  debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libPyImath_Python3_*-3_1.so.29
+	dh_install -p$(pkg_py)  debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libPyImath_Python3_*-3_1.so.29.8.0
+	dh_install -p$(pkg_py)  debian/tmp/usr/lib/python3/dist-packages/imath.so
+	dh_install -p$(pkg_py)  debian/tmp/usr/lib/python3/dist-packages/imathnumpy.so
+endif