[Git][debian-gis-team/doris][master] 2 commits: Switch to Python 3.

[Bas Couwenberg]

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


Commits:
edc83185 by Bas Couwenberg at 2019-07-21T14:15:17Z
Switch to Python 3.

- - - - -
b452d980 by Bas Couwenberg at 2019-07-21T14:22:33Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,12 @@
-doris (5.0.3~beta+dfsg-8) UNRELEASED; urgency=medium
+doris (5.0.3~beta+dfsg-8) unstable; urgency=medium
 
   * Team upload.
   * Remove package name from lintian overrides.
   * Update gbp.conf to use --source-only-changes by default.
   * Bump Standards-Version to 4.4.0, no changes.
+  * Switch to Python 3.
 
- -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Mar 2019 15:19:28 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 21 Jul 2019 16:22:23 +0200
 
 doris (5.0.3~beta+dfsg-7) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -6,19 +6,20 @@ Priority: optional
 Build-Depends: debhelper (>= 11),
                dh-python,
                tcsh | c-shell,
+               libepr-api-dev,
                libfftw3-dev,
                liblapack-dev,
                libtriangle-dev,
-               libepr-api-dev,
-               python-all,
-               python-setuptools,
-               python-numpy,
-               python-scipy,
-               python-gdal,
-               python-fastkml,
-               python-fiona,
-               python-shapely,
-               python-requests
+               python2-minimal,
+               python3-all,
+               python3-fastkml,
+               python3-fiona,
+               python3-gdal,
+               python3-numpy,
+               python3-requests,
+               python3-scipy,
+               python3-setuptools,
+               python3-shapely
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/doris
 Vcs-Git: https://salsa.debian.org/debian-gis-team/doris.git
@@ -26,26 +27,26 @@ Homepage: http://doris.tudelft.nl
 
 Package: doris
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         python,
-         python-lxml,
-         python-numpy,
-         python-scipy,
-         python-gdal,
-         python-fastkml,
-         python-fiona,
-         python-shapely,
-         python-requests,
+Depends: python3,
+         python3-fastkml,
+         python3-fiona,
+         python3-gdal,
+         python3-lxml,
+         python3-numpy,
+         python3-requests,
+         python3-scipy,
+         python3-shapely,
          libxslt1.1,
          gdal-bin,
          gawk | mawk,
-         tcsh | c-shell
+         tcsh | c-shell,
+         ${python3:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: snaphu,
             gmt,
             gv,
-            python-h5py
+            python3-h5py
 Suggests: eog,
           imagemagick
 Description: Delft object-oriented radar interferometric software


=====================================
debian/lintian-overrides
=====================================
@@ -1,6 +1,3 @@
-# Python 3 not supported yet.
-dependency-on-python-version-marked-for-end-of-life (Depends: python)
-
 # Upstream strongly relies on csh (no alternative available at the moment)
 csh-considered-harmful usr/share/doris/ascii2ascii_UTM
 csh-considered-harmful usr/share/doris/ascii2grdAutoMinMaxHDR


=====================================
debian/rules
=====================================
@@ -29,7 +29,7 @@ EXTRA_FLAGS = -Wno-deprecated -D__USE_FFTW_LIBRARY__ -D__USE_LAPACK_LIBRARY__ -D
 
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3
 
 override_dh_auto_configure:
 	if [ ! -f doris_core/Makefile.bak ]; then \
@@ -74,12 +74,10 @@ override_dh_auto_install:
 
 	dh_auto_install
 
-	rm -f debian/doris/usr/lib/python2.7/dist-packages/doris_stack/functions/create_image.py
+	rm -f debian/doris/usr/lib/python*/dist-packages/doris_stack/functions/create_image.py
 
 	install -D --mode=0644 debian/overrides debian/doris/usr/share/lintian/overrides/doris
 
-	dh_python2
-
 override_dh_auto_clean:
 	dh_auto_clean
 	$(MAKE) -C sar_tools cleaner
@@ -98,6 +96,8 @@ override_dh_auto_clean:
 		fi \
 	fi
 
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3
 
 .PHONY: override_dh_auto_configure override_dh_auto_build \
         override_dh_auto_install override_dh_auto_clean



View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/compare/98ffb0be54635040367af1c5c33006f7c1f75963...b452d9806988c75b9ca164cf5f2707b18b3d1e65

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/compare/98ffb0be54635040367af1c5c33006f7c1f75963...b452d9806988c75b9ca164cf5f2707b18b3d1e65
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/20190721/fc199e96/attachment-0001.html>