Sync django.contrib.gis.gdal with upstream (#956)

django-stubs/contrib/gis/gdal/__init__.pyi

@@ -1,11 +1,15 @@
-from django.contrib.gis.gdal.datasource import DataSource
-from django.contrib.gis.gdal.driver import Driver
+from django.contrib.gis.gdal.datasource import DataSource as DataSource
+from django.contrib.gis.gdal.driver import Driver as Driver
+from django.contrib.gis.gdal.envelope import Envelope as Envelope
 from django.contrib.gis.gdal.error import GDALException as GDALException
 from django.contrib.gis.gdal.error import SRSException as SRSException
 from django.contrib.gis.gdal.error import check_err as check_err
+from django.contrib.gis.gdal.geometries import OGRGeometry as OGRGeometry
+from django.contrib.gis.gdal.geomtype import OGRGeomType as OGRGeomType
 from django.contrib.gis.gdal.libgdal import GDAL_VERSION as GDAL_VERSION
 from django.contrib.gis.gdal.libgdal import gdal_full_version as gdal_full_version
 from django.contrib.gis.gdal.libgdal import gdal_version as gdal_version
+from django.contrib.gis.gdal.raster.source import GDALRaster as GDALRaster
 from django.contrib.gis.gdal.srs import AxisOrder as AxisOrder
 from django.contrib.gis.gdal.srs import CoordTransform as CoordTransform
 from django.contrib.gis.gdal.srs import SpatialReference as SpatialReference