From 8374282d2ad5cee868b7be9da253648f9b5966a8 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 15 Jan 2021 13:07:46 +0100
Subject: [PATCH] Release of 3.10.14

---
 CMakeLists.txt                     |  2 +-
 ChangeLog                          | 89 ++++++++++++++++++++++++++++++
 debian/changelog                   | 10 +++-
 linux/org.qgis.qgis.appdata.xml.in |  1 +
 4 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 570a396dc04..60be623ebf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(CMAKE_LINK_DEPENDS_NO_SHARED ON)
 # Project and version
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
 SET(CPACK_PACKAGE_VERSION_MINOR "10")
-SET(CPACK_PACKAGE_VERSION_PATCH "13")
+SET(CPACK_PACKAGE_VERSION_PATCH "14")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "A Coruña")
 PROJECT(qgis VERSION ${COMPLETE_VERSION})
diff --git a/ChangeLog b/ChangeLog
index 7e308911f4b..9429fca014e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+Jürgen E. Fischer <jef@norbit.de>	2021-01-15
+
+    translation update for 3.10.14 from transifex
+
+Jürgen E. Fischer <jef@norbit.de>	2021-01-15
+
+    update qgsproject.sip.in
+
+Jürgen E. Fischer <jef@norbit.de>	2021-01-15
+
+    firstrundialog: point to 3.10 changelog (fixes #41028)
+
+Nyall Dawson <nyall.dawson@gmail.com>	2021-01-13
+
+    Correctly expose QgsLayoutItemAttributeTable::getTableContents to sip,
+    so that this class can be reused from Python classes
+
+    Fixes https://github.com/gltn/stdm/issues/411
+
+    (cherry picked from commit a8c3b02cddbce1f13eb99d4cca9bfa93981d7e19)
+
+github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2020-12-30
+
+    MetaSearch: update bbox CRS
+
+github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2020-12-28
+
+    Safety check for expression initialized
+
+qgis-bot <58983587+qgis-bot@users.noreply.github.com>	2020-12-22
+
+    [Backport release-3_10] Fix #38473, forgetting CRS in a new project (#40707)
+
+    * Fix #38473, forgetting CRS in a new project
+
+Julien Cabieces <julien.cabieces@oslandia.com>	2020-10-15
+
+    fix QCOMPARE
+
+Julien Cabieces <julien.cabieces@oslandia.com>	2020-10-14
+
+    Fixes #39063 : Don't clear document path when its null representation
+
+Denis Rouzaud <denis.rouzaud@gmail.com>	2020-12-09
+
+    only display actions for single features in action menu
+
+    (cherry picked from commit 7f1601a1d81668e0c0b992b174cff652f73e0061)
+
+Julien Cabieces <julien.cabieces@oslandia.com>	2020-11-03
+
+    fix doxygen missing def param
+
+Nyall Dawson <nyall.dawson@gmail.com>	2020-10-21
+
+    Further improvements to QgsProject dox
+
+Julien Cabieces <julien.cabieces@oslandia.com>	2020-10-20
+
+    ReadEntry ok value must be set to False when property doesn't exist
+
+     Fixes #37851 : readEntry ok value must be set to False when property doesn't exist
+
+Nyall Dawson <nyall.dawson@gmail.com>	2020-11-19
+
+    Fix errors and inconsistencies resulting from adding M values to
+    a dataset with a ****25D wkb type
+
+    Previously we did not handle adding M values to any "25d" WKB
+    type (as there's no such thing as Point25DM, etc). But being strict
+    like this turns out to be wrong, because it results in corrupted/
+    inconsistent geometries as a result of calls to QgsAbstractGeometry.addMValue()
+    whenever the original geometry is a 25D type.
+
+    In this situation, the M values were being added but the WKB type
+    wasn't being updated to reflect this and would remain at the original *25D
+    type. Ultimately, this causes GDAL to reject any wkb generated for the
+    geometries and failures to write features into an output dataset.
+
+    This is especially the case with GDB files, where the dataset can
+    sometimes be reported as a ZM type while individual features are
+    only 25D types (for whatever archiac reasons!)
+
+    (cherry picked from commit 6c30a4640d196090f8a0dda176e2d1ad6022b63e)
+
+Jürgen E. Fischer <jef@norbit.de>	2020-12-21
+
+    Release of 3.10.13
+
 Jürgen E. Fischer <jef@norbit.de>	2020-12-21
 
     translation update for 3.10.13 from transifex
diff --git a/debian/changelog b/debian/changelog
index 9be0079d422..646a71b7fff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (3.10.13) UNRELEASED; urgency=medium
+qgis (3.10.14) UNRELEASED; urgency=medium
+
+  * Release of 3.10.14
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 15 Jan 2021 13:07:46 +0100
+
+qgis (3.10.13) unstable; urgency=medium
 
   * Release of 3.10.13
 
- -- Jürgen E. Fischer <jef@norbit.de>  Mon, 21 Dec 2020 00:13:32 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Fri, 15 Jan 2021 13:07:46 +0100
 
 qgis (3.10.12) unstable; urgency=medium
 
diff --git a/linux/org.qgis.qgis.appdata.xml.in b/linux/org.qgis.qgis.appdata.xml.in
index 1377a75f30e..930f9f8e6b8 100644
--- a/linux/org.qgis.qgis.appdata.xml.in
+++ b/linux/org.qgis.qgis.appdata.xml.in
@@ -18,6 +18,7 @@
 
   <project_group>QGIS</project_group>
   <releases>
+    <release version="3.10.14" date="2021-01-15" />
     <release version="3.10.13" date="2020-12-21" />
     <release version="3.10.12" date="2020-11-20" />
     <release version="3.10.11" date="2020-10-23" />