From a404f75f92971634c76330f3742261d33ccecca1 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Mon, 8 May 2017 10:59:16 -0400
Subject: [PATCH] Fixed #28181 -- Added detection for GDAL 2.1 and 2.0.

Follow up to:
ffdf507ec0821f0520e315c2e8a6cf231ea3fd5a (adding GDAL 2.0 support)
ebaa2fef27644430e2b9dfa912f02e39582bfc05 (confirming GDAL 2.1 support)
8c7778884bced3e756ce139da781b0c8c8b2395c (removing GDAL 1.8, 1.7 support)
---
 django/contrib/gis/gdal/libgdal.py | 4 ++--
 docs/releases/1.11.2.txt           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
index 5e617ee447..ac0b9bbd44 100644
--- a/django/contrib/gis/gdal/libgdal.py
+++ b/django/contrib/gis/gdal/libgdal.py
@@ -21,10 +21,10 @@ if lib_path:
     lib_names = None
 elif os.name == 'nt':
     # Windows NT shared libraries
-    lib_names = ['gdal111', 'gdal110', 'gdal19', 'gdal18', 'gdal17']
+    lib_names = ['gdal21', 'gdal20', 'gdal111', 'gdal110', 'gdal19']
 elif os.name == 'posix':
     # *NIX library names.
-    lib_names = ['gdal', 'GDAL', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0']
+    lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0']
 else:
     raise GDALException('Unsupported OS "%s"' % os.name)
 
diff --git a/docs/releases/1.11.2.txt b/docs/releases/1.11.2.txt
index 084edc5e86..12c03558cc 100644
--- a/docs/releases/1.11.2.txt
+++ b/docs/releases/1.11.2.txt
@@ -9,4 +9,5 @@ Django 1.11.2 fixes several bugs in 1.11.1.
 Bugfixes
 ========
 
-* ...
+* Added detection for GDAL 2.1 and 2.0, and removed detection for unsupported
+  versions 1.7 and 1.8 (:ticket:`28181`).