This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental-2.1 in repository gdal.
commit 48972bbffbb27cf7b6342aac3697a313eb6c86d9 Author: Bas Couwenberg <[email protected]> Date: Thu Feb 2 19:22:14 2017 +0100 Add upstream patch to fix _gdal_array ImportError with Python 3. (closes: #853900) --- debian/changelog | 2 ++ debian/patches/python3-import-gdal_array.patch | 28 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) diff --git a/debian/changelog b/debian/changelog index abc8e90..29bbc8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ gdal (2.1.3+dfsg-1~exp2) UNRELEASED; urgency=medium * Update symbols for kfreebsd-{amd64,i386}. + * Add upstream patch to fix _gdal_array ImportError with Python 3. + (closes: #853900) -- Bas Couwenberg <[email protected]> Sat, 28 Jan 2017 14:02:09 +0100 diff --git a/debian/patches/python3-import-gdal_array.patch b/debian/patches/python3-import-gdal_array.patch new file mode 100644 index 0000000..f3f901f --- /dev/null +++ b/debian/patches/python3-import-gdal_array.patch @@ -0,0 +1,28 @@ +Description: Python bindings: fix 'import osgeo.gdal_array' with python3 and SWIG 3.0.10 +Author: Even Rouault +Origin: https://trac.osgeo.org/gdal/changeset/37277 +Bug: https://trac.osgeo.org/gdal/ticket/6801 +Bug-Debian: https://bugs.debian.org/853900 + +--- a/swig/include/gdal_array.i ++++ b/swig/include/gdal_array.i +@@ -994,7 +994,7 @@ retStringAndCPLFree* GetArrayFilename(Py + + %pythoncode %{ + import numpy +-import _gdal_array ++from . import _gdal_array + + import gdalconst + import gdal +--- a/swig/python/osgeo/gdal_array.py ++++ b/swig/python/osgeo/gdal_array.py +@@ -145,7 +145,7 @@ def RATValuesIONumPyRead(*args, **kwargs + return _gdal_array.RATValuesIONumPyRead(*args, **kwargs) + RATValuesIONumPyRead = _gdal_array.RATValuesIONumPyRead + import numpy +-import _gdal_array ++from . import _gdal_array + + import gdalconst + import gdal diff --git a/debian/patches/series b/debian/patches/series index d0d5927..d3015bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ perl-vendor privacy-breach-logo.patch sort-files-in-static-library.patch spelling-errors.patch +python3-import-gdal_array.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
