Bug#1008640: scikit-fmm: diff for NMU version 2019.1.30-1.1

[Sebastian Ramacher]

Dear maintainer,

since this issue is currently blocking the python3.10-default
transition, I've prepared an NMU for scikit-fmm (versioned as
2019.1.30-1.1). The diff is attached to this message.

Cheers
-- 
Sebastian Ramacher

diff -Nru scikit-fmm-2019.1.30/debian/changelog scikit-fmm-2019.1.30/debian/changelog
--- scikit-fmm-2019.1.30/debian/changelog	2020-11-14 17:13:33.000000000 +0100
+++ scikit-fmm-2019.1.30/debian/changelog	2022-04-07 00:36:51.000000000 +0200
@@ -1,3 +1,13 @@
+scikit-fmm (2019.1.30-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+
+  [ Graham Inggs ]
+  * Cythonize at build time to fix FTBFS with Python 3.10 (Closes: #1008640)
+  * Call dh --with numpy3 to pick up dependency on numpy-abi
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Thu, 07 Apr 2022 00:36:51 +0200
+
 scikit-fmm (2019.1.30-1) unstable; urgency=medium
 
   * Initial release (Closes: #974160)
diff -Nru scikit-fmm-2019.1.30/debian/control scikit-fmm-2019.1.30/debian/control
--- scikit-fmm-2019.1.30/debian/control	2020-11-14 17:13:33.000000000 +0100
+++ scikit-fmm-2019.1.30/debian/control	2022-04-07 00:33:42.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Bdale Garbee <bd...@gag.com>
 Build-Depends: debhelper (>= 13), dh-python, python3-all, python3-setuptools,
- python3-numpy, python3-dev
+ python3-numpy, python3-dev, cython3
 Standards-Version: 4.5.0
 Homepage: https://github.com/scikit-fmm/scikit-fmm/
 X-Python3-Version: >= 3.6
diff -Nru scikit-fmm-2019.1.30/debian/rules scikit-fmm-2019.1.30/debian/rules
--- scikit-fmm-2019.1.30/debian/rules	2020-11-14 17:13:33.000000000 +0100
+++ scikit-fmm-2019.1.30/debian/rules	2022-04-07 00:33:34.000000000 +0200
@@ -8,7 +8,15 @@
 export LDFLAGS+=$(shell python3-config --ldflags)
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python3 --with numpy3 --buildsystem=pybuild
+
+override_dh_auto_clean:
+	rm -f $(CURDIR)/skfmm/pheap.cpp
+	dh_auto_clean
+
+override_dh_auto_configure:
+	cython3 --cplus -3 $(CURDIR)/skfmm/pheap.pyx
+	dh_auto_configure
 
 
 # If you need to rebuild the Sphinx documentation

signature.asc
Description: PGP signature