Release of 2.14.15

jef-n · jef-n · commit a916bf468ba5 · 2017-05-19T14:00:04.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 "14")
-SET(CPACK_PACKAGE_VERSION_PATCH "14")
+SET(CPACK_PACKAGE_VERSION_PATCH "15")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Essen")
 IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,53 @@
+Juergen E. Fischer <jef@norbit.de>	2017-05-18
+
+    indentation fix
+
+Juergen E. Fischer <jef@norbit.de>	2017-05-18
+
+    crssync: check result of CSVReadParseLine instead of feof
+
+    (cherry picked from commit 27f4b0e1e008d3ed60ee0f7f178f93b22bacabe9)
+
+Merge: 6feed195ca b830eab6af
+rldhont <rldhont@gmail.com>	2017-05-16
+
+    Merge pull request #4545 from rldhont/release-2_14-processing-rscripts-outputs
+
+    [BUGFIX][Processing] R scripts do not have enough outputs
+
+Alexander Bruy <alexander.bruy@gmail.com>	2017-05-13
+
+    [processing] stop algorithm execution if geometry/feature error occured
+    (fix #11986)
+
+rldhont <rldhont@gmail.com>	2017-05-12
+
+    [BUGFIX][Processing] R scripts do not have enough outputs
+
+    R scripts in processing only supports Vector, Raster and Table.
+    This commit adds fix the file output and adds directory, number and string outputs.
+
+Marco Hugentobler <marco.hugentobler@sourcepole.ch>	2017-04-18
+
+    Fix layer drawing order in server to also work in complex projects and with custom drawing order
+
+rldhont <rldhont@gmail.com>	2017-04-27
+
+    [BUGFIX][Server] QgsOWSServer restorer modifying layers and not well restoring them
+
+    The Subsetstring is updated through QgsVectorLayer::setSubsetString and restored by QgsVectorDataProvider::setSubsetString and it's not idempotent.
+    The solution is to use QgsVectorLayer::setSubsetString in the 2 cases.
+
+Even Rouault <even.rouault@spatialys.com>	2016-10-06
+
+    Properly deal with empty cache/directory in server
+
+    backport 41693604674384ddd2b3869378db9b9d645d61a4
+
+Juergen E. Fischer <jef@norbit.de>	2017-04-21
+
+    Release of 2.14.14
+
 rldhont <rldhont@gmail.com>	2017-04-20
 
     [BUGFIX][Processing] Fix spatialite version comparison
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.14.14) UNRELEASED; urgency=medium
+qgis (2.14.15) UNRELEASED; urgency=medium
+
+  * Release of 2.14.15
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 19 May 2017 14:00:04 +0200
+
+qgis (2.14.14) unstable; urgency=medium
 
   * Release of 2.14.14
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 21 Apr 2017 14:36:44 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 19 May 2017 14:00:04 +0200
 
 qgis (2.14.13) unstable; urgency=medium
 
