This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gdal.
commit 31e8a6bb9b459cb90c111eebc3a4e601af5aeba7 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 | 7 +++++++ debian/patches/python3-import-gdal_array.patch | 28 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 36 insertions(+) diff --git a/debian/changelog b/debian/changelog index c030ce6..d8098df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gdal (2.1.2+dfsg-3) UNRELEASED; urgency=medium + + * Add upstream patch to fix _gdal_array ImportError with Python 3. + (closes: #853900) + + -- Bas Couwenberg <[email protected]> Thu, 02 Feb 2017 20:15:19 +0100 + gdal (2.1.2+dfsg-2) unstable; urgency=medium * Add upstream patch to fix crash on URLs that are not DODS servers. 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 aeefe2e..db0623d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ privacy-breach-logo.patch sort-files-in-static-library.patch spelling-errors.patch svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.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

