From ffdc37cd8750eaa0a7a03dc5623ab59ce2401a02 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Mon, 7 Jun 2021 07:54:28 -0400
Subject: [PATCH] 2.6.5 Version Bump and Changelog

---
 CHANGELOG.md                                  | 31 +++++++++++++++++++
 CMakeLists.txt                                |  2 +-
 .../linux/org.keepassxc.KeePassXC.appdata.xml | 26 ++++++++++++++++
 snap/snapcraft.yaml                           |  2 +-
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6422d7b89..e21063e5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog
 
+## 2.6.5 (2021-06-07)
+
+### Added
+
+- Show search bar when toolbar is hidden or in overflow [#6279]
+- Show countdown for clipboard clearing in status bar [#6333]
+- Command line option to lock all open databases [#6511]
+- Allow CSV import of bare TOTP secrets [#6211]
+- Retain file creation time when saving database [#6576]
+- Set permissions of saved attachments to be private to the current user [#6363]
+- OPVault: Use Text instead of Name for attribute names [#6334]
+
+### Changed
+
+- Reports: Allow resizing of reports columns [#6435]
+- Reports: Toggle showing expired entries [#6534]
+- Save Always on Top setting [#6236]
+- Password generator can exclude additional lookalike characters (6/G, 8/B) [#6196]
+
+### Fixed
+
+- Allow setting MSI properties in unattended install [#6196]
+- Update MainWindow minimum size to enable smaller verticle space [#6196]
+- Use application font size when setting default or monospace fonts [#6332]
+- Fix notes not clearing in entry preview panel in some cases [#6481]
+- macOS: Correct window activation when restoring from tray [#6575]
+- macOS: Better handling of minimize after unlock when using browser integration [#6338]
+- Linux: Start after the system tray is available on LXQt [#6216]
+- Linux: Allow selection of modal dialogs on X11 in Auto-Type [#6204]
+- KeeShare: prevent crash when file extension is missing [#6174]
+
 ## 2.6.4 (2021-01-31)
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55cecbe74..dd7861cf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "6")
-set(KEEPASSXC_VERSION_PATCH "4")
+set(KEEPASSXC_VERSION_PATCH "5")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index d9779e3df..fb9eb6f0c 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,32 @@
     </screenshots>
 
     <releases>
+        <release version="2.6.5" date="2021-06-07">
+            <description>
+                <ul>
+                    <li>Show search bar when toolbar is hidden or in overflow [#6279]</li>
+                    <li>Show countdown for clipboard clearing in status bar [#6333]</li>
+                    <li>Command line option to lock all open databases [#6511]</li>
+                    <li>Allow CSV import of bare TOTP secrets [#6211]</li>
+                    <li>Retain file creation time when saving database [#6576]</li>
+                    <li>Set permissions of saved attachments to be private to the current user [#6363]</li>
+                    <li>OPVault: Use Text instead of Name for attribute names [#6334]</li>
+                    <li>Reports: Allow resizing of reports columns [#6435]</li>
+                    <li>Reports: Toggle showing expired entries [#6534]</li>
+                    <li>Save Always on Top setting [#6236]</li>
+                    <li>Password generator can exclude additional lookalike characters (6/G, 8/B) [#6196]</li>
+                    <li>Allow setting MSI properties in unattended install [#6196]</li>
+                    <li>Update MainWindow minimum size to enable smaller verticle space [#6196]</li>
+                    <li>Use application font size when setting default or monospace fonts [#6332]</li>
+                    <li>Fix notes not clearing in entry preview panel in some cases [#6481]</li>
+                    <li>macOS: Correct window activation when restoring from tray [#6575]</li>
+                    <li>macOS: Better handling of minimize after unlock when using browser integration [#6338]</li>
+                    <li>Linux: Start after the system tray is available on LXQt [#6216]</li>
+                    <li>Linux: Allow selection of modal dialogs on X11 in Auto-Type [#6204]</li>
+                    <li>KeeShare: prevent crash when file extension is missing [#6174]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.6.4" date="2021-01-31">
             <description>
                 <ul>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6efa26b7f..822b10398 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.6.4
+version: 2.6.5
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |