Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package gdal The only change is the fix for #853900 _gdal_array ImportError with Python 3. unblock gdal/2.1.2+dfsg-3 Kind Regards, Bas
diff -Nru gdal-2.1.2+dfsg/debian/changelog gdal-2.1.2+dfsg/debian/changelog --- gdal-2.1.2+dfsg/debian/changelog 2016-11-09 18:38:03.000000000 +0100 +++ gdal-2.1.2+dfsg/debian/changelog 2017-02-02 20:15:59.000000000 +0100 @@ -1,3 +1,10 @@ +gdal (2.1.2+dfsg-3) unstable; urgency=medium + + * Add upstream patch to fix _gdal_array ImportError with Python 3. + (closes: #853900) + + -- Bas Couwenberg <sebas...@debian.org> Thu, 02 Feb 2017 20:15:59 +0100 + gdal (2.1.2+dfsg-2) unstable; urgency=medium * Add upstream patch to fix crash on URLs that are not DODS servers. diff -Nru gdal-2.1.2+dfsg/debian/patches/python3-import-gdal_array.patch gdal-2.1.2+dfsg/debian/patches/python3-import-gdal_array.patch --- gdal-2.1.2+dfsg/debian/patches/python3-import-gdal_array.patch 1970-01-01 01:00:00.000000000 +0100 +++ gdal-2.1.2+dfsg/debian/patches/python3-import-gdal_array.patch 2017-02-02 20:14:31.000000000 +0100 @@ -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 -Nru gdal-2.1.2+dfsg/debian/patches/series gdal-2.1.2+dfsg/debian/patches/series --- gdal-2.1.2+dfsg/debian/patches/series 2016-11-09 18:31:25.000000000 +0100 +++ gdal-2.1.2+dfsg/debian/patches/series 2017-02-02 20:15:40.000000000 +0100 @@ -11,3 +11,4 @@ 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
