From 642daa641bf7aedf0d0c0d1c1cb047d794b1ccbf Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Tue, 6 Mar 2018 22:54:01 +0100
Subject: [PATCH] Bump version to 2.3.1 and update CHANGELOG

---
 CHANGELOG                                     | 23 +++++++++++++++++
 CMakeLists.txt                                |  2 +-
 .../linux/org.keepassxc.KeePassXC.appdata.xml | 25 +++++++++++++++++++
 snapcraft.yaml                                |  2 +-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 038943890..fa3700e5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+2.3.1 (2018-03-06)
+=========================
+
+- Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped [#1568]
+- Abort saving and show an error message when challenge-response fails [#1659]
+- Support inner stream protection on all string attributes [#1646]
+- Fix favicon downloads not finishing on some websites [#1657]
+- Fix freeze due to invalid STDIN data [#1628]
+- Correct issue with encrypted RSA SSH keys [#1587]
+- Fix crash on macOS due to QTBUG-54832 [#1607]
+- Show error message if ssh-agent communication fails [#1614]
+- Fix --pw-stdin and filename parameters being ignored [#1608]
+- Fix Auto-Type syntax check not allowing spaces and special characters [#1626]
+- Fix reference placeholders in combination with Auto-Type [#1649]
+- Fix qtbase translations not being loaded [#1611]
+- Fix startup crash on Windows due to missing SVG libraries [#1662]
+- Correct database tab order regression [#1610]
+- Fix GCC 8 compilation error [#1612]
+- Fix copying of advanced attributes on KDE [#1640]
+- Fix member initialization of CategoryListWidgetDelegate [#1613]
+- Fix inconsistent toolbar icon sizes and provide higher-quality icons [#1616]
+- Improve preview panel geometry [#1609]
+
 2.3.0 (2018-02-27)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08c910aa0..4c8929aef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "0")
+set(KEEPASSXC_VERSION_PATCH "1")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 39dfa7d3a..f5796e4ea 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,31 @@
     </screenshots>
 
     <releases>
+        <release version="2.3.1" date="2018-03-06">
+            <description>
+                <ul>
+                    <li>Fix unnecessary automatic upgrade to KDBX 4.0 and prevent challenge-response key being stripped [#1568]</li>
+                    <li>Abort saving and show an error message when challenge-response fails [#1659]</li>
+                    <li>Support inner stream protection on all string attributes [#1646]</li>
+                    <li>Fix favicon downloads not finishing on some websites [#1657]</li>
+                    <li>Fix freeze due to invalid STDIN data [#1628]</li>
+                    <li>Correct issue with encrypted RSA SSH keys [#1587]</li>
+                    <li>Fix crash on macOS due to QTBUG-54832 [#1607]</li>
+                    <li>Show error message if ssh-agent communication fails [#1614]</li>
+                    <li>Fix --pw-stdin and filename parameters being ignored [#1608]</li>
+                    <li>Fix Auto-Type syntax check not allowing spaces and special characters [#1626]</li>
+                    <li>Fix reference placeholders in combination with Auto-Type [#1649]</li>
+                    <li>Fix qtbase translations not being loaded [#1611]</li>
+                    <li>Fix startup crash on Windows due to missing SVG libraries [#1662]</li>
+                    <li>Correct database tab order regression [#1610]</li>
+                    <li>Fix GCC 8 compilation error [#1612]</li>
+                    <li>Fix copying of advanced attributes on KDE [#1640]</li>
+                    <li>Fix member initialization of CategoryListWidgetDelegate [#1613]</li>
+                    <li>Fix inconsistent toolbar icon sizes and provide higher-quality icons [#1616]</li>
+                    <li>Improve preview panel geometry [#1609]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.3.0" date="2018-02-27">
             <description>
                 <ul>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 701174182..7fe9f9726 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.0
+version: 2.3.1
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |