From 4112bce442c96747f588b9f99f63e45634950972 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 30 May 2017 09:39:59 -0400
Subject: [PATCH] [1.11.x] Refs #28181 -- Corrected detection of GDAL 2.1 on
 Windows.

Follow up to a404f75f92971634c76330f3742261d33ccecca1.

Backport of c32476e5ba2f1c18758cfcffc857fa4eab37e816 from master
---
 django/contrib/gis/gdal/libgdal.py | 2 +-
 docs/releases/1.11.2.txt           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
index 232865f4931..022aa945d75 100644
--- a/django/contrib/gis/gdal/libgdal.py
+++ b/django/contrib/gis/gdal/libgdal.py
@@ -23,7 +23,7 @@ if lib_path:
     lib_names = None
 elif os.name == 'nt':
     # Windows NT shared libraries
-    lib_names = [str('gdal21'), str('gdal20'), str('gdal111'), str('gdal110'), str('gdal19')]
+    lib_names = [str('gdal201'), str('gdal20'), str('gdal111'), str('gdal110'), str('gdal19')]
 elif os.name == 'posix':
     # *NIX library names.
     lib_names = ['gdal', 'GDAL', 'gdal2.1.0', 'gdal2.0.0', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0']
diff --git a/docs/releases/1.11.2.txt b/docs/releases/1.11.2.txt
index 718dc386bb5..99e82f75a01 100644
--- a/docs/releases/1.11.2.txt
+++ b/docs/releases/1.11.2.txt
@@ -42,3 +42,5 @@ Bugfixes
 
 * Prevented ``Subquery`` from adding an unnecessary ``CAST`` which resulted in
   invalid SQL (:ticket:`28199`).
+
+* Corrected detection of GDAL 2.1 on Windows (:ticket:`28181`).