[Git][debian-gis-team/saga][master] 4 commits: Add upstream patch to fix FTBFS with SWIG 4.2.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / saga


Commits:
219f52d5 by Bas Couwenberg at 2024-02-09T14:53:31+01:00
Add upstream patch to fix FTBFS with SWIG 4.2.

- - - - -
4a85a0a2 by Bas Couwenberg at 2024-02-09T14:55:41+01:00
Reinstate Python bindings.

Revert "Drop Python bindings, causes FTBFS with SWIG 4.2. (closes: #1062880)"

This reverts commit 1123980dbf124870a263780ea664f3f8fbbeb76d.

- - - - -
49abfa09 by Bas Couwenberg at 2024-02-09T14:56:08+01:00
Switch to dh-sequence-*.

- - - - -
ce20fd56 by Bas Couwenberg at 2024-02-09T14:56:19+01:00
Set distribution to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/0001-saga_api-mat_tools.h-M_ALMOST_ZERO-fixes-swig-compil.patch
- debian/patches/series
- + debian/python3-saga.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+saga (9.3.1+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add upstream patch to fix FTBFS with SWIG 4.2.
+  * Reinstate Python bindings.
+  * Switch to dh-sequence-*.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 09 Feb 2024 14:56:08 +0100
+
 saga (9.3.1+dfsg-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -6,6 +6,8 @@ Section: science
 Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
+               dh-python,
+               dh-sequence-python3,
                libdxflib-dev,
                libexpat-dev,
                libgdal-dev,
@@ -15,6 +17,8 @@ Build-Depends: cmake,
                libsvm-dev,
                libwxgtk3.2-dev,
                pkgconf,
+               python3-dev,
+               swig
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
 Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git
@@ -89,3 +93,17 @@ Description: SAGA GIS shared library (graphical models)
  information system used for editing and analysing spatial data.
  .
  This package contains the library files for developing graphical modules.
+
+Package: python3-saga
+Architecture: any
+Section: python
+Depends: ${python3:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: saga (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Description: SAGA GIS Python bindings
+ SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
+ information system used for editing and analysing spatial data.
+ .
+ This package contains the Python bindings to SAGA.


=====================================
debian/patches/0001-saga_api-mat_tools.h-M_ALMOST_ZERO-fixes-swig-compil.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Fix FTBFS with SWIG 4.2.
+Author: oconrad <olaf.conrad at uni-hamburg.de>
+Origin: https://sourceforge.net/p/saga-gis/code/ci/2292c9236f4fed151cb623dc41d6d01a84deedb4/
+Bug: https://sourceforge.net/p/saga-gis/bugs/317/
+
+--- a/saga-gis/src/saga_core/saga_api/mat_tools.h
++++ b/saga-gis/src/saga_core/saga_api/mat_tools.h
+@@ -117,8 +117,8 @@
+ #define N_MEGABYTE_BYTES			0x100000
+ 
+ //---------------------------------------------------------
+-#define M_ALMOST_ZERO				0.001l
+-#define M_TINY						(1.0e-20)
++#define M_ALMOST_ZERO				(1.e-03)
++#define M_TINY						(1.e-20)
+ 
+ //---------------------------------------------------------
+ #define M_SQR(x)					((x) * (x))


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 python.patch
+0001-saga_api-mat_tools.h-M_ALMOST_ZERO-fixes-swig-compil.patch


=====================================
debian/python3-saga.install
=====================================
@@ -0,0 +1 @@
+usr/lib/python*


=====================================
debian/rules
=====================================
@@ -3,6 +3,8 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
 CFLAGS += $(CPPFLAGS)
 
 include /usr/share/dpkg/pkg-info.mk
@@ -30,3 +32,9 @@ execute_after_dh_auto_install:
 	# Explicitly remove files not to be installed
 	find $(CURDIR)/debian/tmp/usr/lib -name "*.pyc" -delete
 	find $(CURDIR)/debian/tmp/usr/lib -name "*.pyo" -delete
+
+override_dh_python3:
+	dh_python3 --no-ext-rename
+
+override_dh_makeshlibs:
+	dh_makeshlibs -Xpython3-saga



View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/983065281eb91ccec62ae5e8d73ed2a7c45c093b...ce20fd56e30d86d367849eb45f4a9cec9925a08e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/983065281eb91ccec62ae5e8d73ed2a7c45c093b...ce20fd56e30d86d367849eb45f4a9cec9925a08e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240209/10114a91/attachment-0001.htm>