debian/changelog

@@ -7,12 +7,13 @@ saga (7.3.0+dfsg-1~exp1) UNRELEASED; urgency=medium
     - Update paths for moved files
     - Drop idw source files, removed upstream
   * Add patch to fix spelling errors.
-  * Add lintian overrides for usr-share-doc-symlink-to-foreign-package.
+  * Switch to Python 3.
 
   [ Johan Van de Wauw ]
   * Also watch for new LTR release
   * Adjust files-excluded paths
   * New upstream version 7.3.0+dfsg
+    (closes: #931941)
   * Use system version of svm
   * Bump saga api packages to new version
   * Add libdxf patch

debian/control

@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 9),
                libsvm-dev,
                libvigraimpex-dev,
                libwxgtk3.0-dev,
-               python-dev,
+               python3-dev,
                swig
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
@@ -61,8 +61,8 @@ Package: libsaga-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libsaga-api-2.3.1 (= ${binary:Version}),
-         libsaga-gdi-2.3.1 (= ${binary:Version}),
+Depends: libsaga-api-7.3.0 (= ${binary:Version}),
+         libsaga-gdi-7.3.0 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: saga (= ${binary:Version})
 Description: SAGA GIS development files
@@ -72,7 +72,7 @@ Description: SAGA GIS development files
  This package contains the header files for developing with SAGA.
  Install this package if you wish to develop software that uses the SAGA API.
 
-Package: libsaga-api-2.3.1
+Package: libsaga-api-7.3.0
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -85,7 +85,7 @@ Description: SAGA GIS shared libraries
  .
  This package contains the library files for developing with SAGA.
 
-Package: libsaga-gdi-2.3.1
+Package: libsaga-gdi-7.3.0
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -101,21 +101,21 @@ Description: SAGA GIS shared library (graphical models)
 Package: libsaga
 Architecture: all
 Section: oldlibs
-Depends: libsaga-api-2.3.1,
-         libsaga-gdi-2.3.1,
+Depends: libsaga-api-7.3.0,
+         libsaga-gdi-7.3.0,
          ${misc:Depends}
 Description: SAGA GIS shared libraries - transitional package
  SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
  information system used for editing and analysing spatial data.
  .
  This package is a transitional package from libsaga to
- libsaga-api-2.3.1 and libsaga-gdi-2.3.1.
+ libsaga-api-7.3.0 and libsaga-gdi-7.3.0.
  It can safely be removed.
 
-Package: python-saga
+Package: python3-saga
 Architecture: any
 Section: python
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: saga (= ${binary:Version})

debian/control.in

@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 9),
                libsvm-dev,
                libvigraimpex-dev,
                libwxgtk3.0-dev,
-               python-dev,
+               python3-dev,
                swig
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
@@ -112,10 +112,10 @@ Description: SAGA GIS shared libraries - transitional package
  libsaga-api-@VERSION@ and libsaga-gdi-@VERSION@.
  It can safely be removed.
 
-Package: python-saga
+Package: python3-saga
 Architecture: any
 Section: python
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: saga (= ${binary:Version})

debian/libsaga-api-7.3.0-dbgsym.lintian-overrides

-# False positive, dbgsym is auto built from same source.
-usr-share-doc-symlink-to-foreign-package *
-

debian/libsaga-gdi-7.3.0-dbgsym.lintian-overrides

-# False positive, dbgsym is auto built from same source.
-usr-share-doc-symlink-to-foreign-package *
-

debian/python-saga.install

-usr/lib/python*/dist-packages/*.so
-usr/lib/python*/dist-packages/*.py

debian/python3-saga.install

+usr/lib/python*

debian/rules

@@ -15,7 +15,7 @@ templates:
 	done
 
 %:
-	dh $@ --with python2 --with autoreconf --parallel
+	dh $@ --with python3 --with autoreconf --parallel
 
 override_dh_clean:
 	dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1
@@ -52,8 +52,5 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --list-missing
 
-override_dh_python2:
-	dh_python2 --no-guessing-versions
-
 override_dh_makeshlibs:
-	dh_makeshlibs -Xpython-saga
+	dh_makeshlibs -Xpython3-saga

debian/source/lintian-overrides

 # Not worth the effort
 testsuite-autopkgtest-missing
 
-# Only a single Python version is supported during the build
-python-foo-but-no-python3-foo python-saga
-