Release of 2.18.24

jef-n · jef-n · commit ff5bd09ab39e · 2018-09-14T14:00:17.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "23")
+SET(CPACK_PACKAGE_VERSION_PATCH "24")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Las Palmas")
 IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,60 @@
+Juergen E. Fischer <jef@norbit.de>	2018-09-03
+
+    workaround for moc issue with app tests
+
+Merge: 2a1459cb99 a5dd6eb877
+rldhont <rldhont@gmail.com>	2018-09-10
+
+    Merge pull request #7827 from rldhont/fix-qgshttptransaction-support-https-server
+
+    [BUGFIX][Server] Quickfix in QgsHttpTransaction to support HTTPS scheme
+
+rldhont <rldhont@gmail.com>	2018-09-07
+
+    [BUGFIX][Server] Quickfix in QgsHttpTransaction to support HTTPS scheme
+
+    The class QgsHttpTransaction is only used in server for getting files provided by URL. This class does not support HTTPS.
+
+    This is a quickfix to enable requesting SLD files provided through HTTPS scheme.
+
+    Fixes #6898 *QGIS mapserver forces http when requesting SLD=https* https://issues.qgis.org/issues/6898 a five year old issue.
+
+Andrew Childs <lorne@cons.org.nz>	2018-08-31
+
+    Fix pyfuture installation under CMake 3.12
+
+    The logic here was incorrect, but managed to do the right thing
+    anyway. Under CMake 3.12, this is a hard error.
+
+Nyall Dawson <nyall.dawson@gmail.com>	2018-09-04
+
+    Also disable OSX builds on Travis - the environment has been broken for a long time
+    and the results are currently ignored anyway
+
+    May as well save some unneeded work for Travis
+
+Nyall Dawson <nyall.dawson@gmail.com>	2018-09-03
+
+    Disable qt5 Travis builds -- the build environment is currently broken
+
+rldhont <rldhont@gmail.com>	2018-08-28
+
+    Fix trusty build (QStringLiteral is Qt5; followup 9241e2d)
+
+Matthias Kuhn <matthias@opengis.ch>	2017-11-09
+
+    [travis] Disable non-local file download tests
+
+    (cherry picked from commit 8d8f38d4c40a64082e396017cbca3399cfafb3ca)
+
+Juergen E. Fischer <jef@norbit.de>	2018-08-26
+
+    Typo fix
+
+Juergen E. Fischer <jef@norbit.de>	2018-08-17
+
+    Release of 2.18.23
+
 Radoslaw Guzinski <radosuav@op.pl>	2018-08-09
 
     [Processing] Fix exception when producing a csv output.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.18.23) UNRELEASED; urgency=medium
+qgis (2.18.24) UNRELEASED; urgency=medium
+
+  * Release of 2.18.24
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 14 Sep 2018 14:00:17 +0200
+
+qgis (2.18.23) unstable; urgency=medium
 
   * Release of 2.18.23
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 17 Aug 2018 14:00:06 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 14 Sep 2018 14:00:17 +0200
 
 qgis (2.18.22) unstable; urgency=medium
 
