From 3d04e2b86e93f33b404012d6891210227f3f5d19 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@keepassxc.org>
Date: Mon, 21 Mar 2022 23:06:38 +0100
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md                                    | 7 +++++--
 release-tool                                    | 5 ++---
 share/linux/org.keepassxc.KeePassXC.appdata.xml | 7 +++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0409c1664..daad84d94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.7.0 (2022-03-20)
+## 2.7.0 (2022-03-21)
 
 ### Major Additions
 - Implement KDBX 4.1 [#7114]
@@ -35,7 +35,7 @@
 - Browser: Add search 'by-path' url to API [#5535]
 - Browser: search for entries by UUID to API [#4763]
 - Browser: Support auto-download of favicon on entry addition [#7179]
-- Auto-Type: Major improvements to Auto-Type [#5864][#7463][#7435][#7391][#7129][#6400][#6364][#6361][#5283]
+- Auto-Type: Major improvements to Auto-Type [#5864][#7463][#7435][#7391][#7129][#6400][#6364][#6361][#5283][#7507]
 - Auto-Type: Fix typing to virtual machines on Windows [#7366]
 - Auto-Type: Re-implement X11 keysym emulation [#7098]
 - Auto-Type: Support multiple Xkb layouts [#6247]
@@ -55,6 +55,7 @@
 - Improve macOS and Windows platform integration [#5851]
 - Lock only the current database by default [#6652]
 - Show expired entries on DB unlock [#7290]
+- Update D-Bus adaptor interface class name to match definition file [#7523]
 
 ### Other Changes and Fixes
 - Add countdown progress bar to TOTP preview [#6930]
@@ -89,6 +90,8 @@
 - Fix adaptive icon painting [#5989][#6033]
 - Fix favicon download from URL with non-standard port [#5509]
 - Ignore recycle bin on KeePassHTTP migration [#5481]
+- Fix keepassxc-cr-recovery utility [#7521]
+- Fix Auto-Type not working when audio recording indicator is active on macOS 12.2+ [#7526]
 
 ## 2.6.6 (2021-06-12)
 
diff --git a/release-tool b/release-tool
index b4acda59a..6d8310d7b 100755
--- a/release-tool
+++ b/release-tool
@@ -530,7 +530,7 @@ merge() {
         git tag -a "$TAG_NAME" -m "$COMMIT_MSG" -m "${CHANGELOG}" -s -u "$GPG_GIT_KEY"
     fi
 
-    logInfo "Fast-Forward latest tag..."
+    logInfo "Advancing 'latest' tag..."
     if [ -z  "$GPG_GIT_KEY" ]; then
         git tag -sf -a "latest" -m "Latest stable release"
     else
@@ -540,8 +540,7 @@ merge() {
     cleanup
 
     logInfo "All done!"
-    logInfo "Please merge the release branch back into the develop branch now and then push your changes."
-    logInfo "Don't forget to also push the tags using \e[1mgit push --tags\e[0m."
+    logInfo "Don't forget to push the tags using \e[1mgit push --tags\e[0m."
 }
 
 # -----------------------------------------------------------------------
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 9f2781815..a3673da7e 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,7 +50,7 @@
     </screenshots>
 
     <releases>
-        <release version="2.7.0" date="2022-02-26">
+        <release version="2.7.0" date="2022-03-21">
             <description>
                 <ul>
                     <li>Implement KDBX 4.1 [#7114]</li>
@@ -85,7 +85,7 @@
                     <li>Browser: Add search 'by-path' url to API [#5535]</li>
                     <li>Browser: search for entries by UUID to API [#4763]</li>
                     <li>Browser: Support auto-download of favicon on entry addition [#7179]</li>
-                    <li>Auto-Type: Major improvements to Auto-Type [#5864][#7463][#7435][#7391][#7129][#6400][#6364][#6361][#5283]</li>
+                    <li>Auto-Type: Major improvements to Auto-Type [#5864][#7463][#7435][#7391][#7129][#6400][#6364][#6361][#5283][#7507]</li>
                     <li>Auto-Type: Fix typing to virtual machines on Windows [#7366]</li>
                     <li>Auto-Type: Re-implement X11 keysym emulation [#7098]</li>
                     <li>Auto-Type: Support multiple Xkb layouts [#6247]</li>
@@ -103,6 +103,7 @@
                     <li>Improve macOS and Windows platform integration [#5851]</li>
                     <li>Lock only the current database by default [#6652]</li>
                     <li>Show expired entries on DB unlock [#7290]</li>
+                    <li>Update D-Bus adaptor interface class name to match definition file [#7523]</li>
                     <li>Add countdown progress bar to TOTP preview [#6930]</li>
                     <li>Enter favicon url directly on icons page [#6614]</li>
                     <li>Set C++17 as standard in the build system [#7180]</li>
@@ -135,6 +136,8 @@
                     <li>Fix adaptive icon painting [#5989][#6033]</li>
                     <li>Fix favicon download from URL with non-standard port [#5509]</li>
                     <li>Ignore recycle bin on KeePassHTTP migration [#5481]</li>
+                    <li>Fix keepassxc-cr-recovery utility [#7521]</li>
+                    <li>Fix Auto-Type not working when audio recording indicator is active on macOS 12.2+ [#7526]</li>
                 </ul>
             </description>
         </release>