From 9d4589562f886037b5488662748bd3a3f86de755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 12 Aug 2023 00:55:41 +0200
Subject: [PATCH 1/2] Update CHANGELOG.md for the 2.3.6 release

---
 CHANGELOG.md                           |  5 +++++
 res/linux/org.mixxx.Mixxx.metainfo.xml | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7482932ec79..c000bc6c152 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,11 @@
 * Don't reject key values from file metadata with non-minor/-major scales.
   [#11001](https://github.com/mixxxdj/mixxx/pull/11001)
   [#10995](https://github.com/mixxxdj/mixxx/issues/10995)
+* Allow playing tracks with durations of more than 6 h
+  [#11511](https://github.com/mixxxdj/mixxx/pull/11511)
+  [#10995](https://github.com/mixxxdj/mixxx/issues/10995)
+* Soundtouch latency compensation updated for version 2.1.1 to 2.3
+  [#11154](https://github.com/mixxxdj/mixxx/pull/11154)
 
 ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10)
 
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index eeaa87b53d2..ef25f684fb1 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -98,7 +98,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.3.6" type="development" date="2023-08-09" timestamp="1691564709">
+    <release version="2.3.6" type="development" date="2023-08-09" timestamp="1691579298">
       <description>
  <ul>
   <li>
@@ -199,6 +199,15 @@
    #11001
    #10995
   </li>
+  <li>
+   Allow playing tracks with durations of more than 6 h
+   #11511
+   #10995
+  </li>
+  <li>
+   Soundtouch latency compensation updated for version 2.1.1 to 2.3
+   #11154
+  </li>
  </ul>
 </description>
     </release>

From 24e4b243b3d102b6071462d487767362f10848ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 12 Aug 2023 15:38:29 +0200
Subject: [PATCH 2/2] Improve changelog texts

Co-authored-by: Jan Holthuis <holthuis.jan@googlemail.com>
---
 CHANGELOG.md                           | 6 +++---
 res/linux/org.mixxx.Mixxx.metainfo.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c000bc6c152..78519404c88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,10 +56,10 @@
 * Don't reject key values from file metadata with non-minor/-major scales.
   [#11001](https://github.com/mixxxdj/mixxx/pull/11001)
   [#10995](https://github.com/mixxxdj/mixxx/issues/10995)
-* Allow playing tracks with durations of more than 6 h
+* Allow playing tracks with durations of more than 6 hours
   [#11511](https://github.com/mixxxdj/mixxx/pull/11511)
-  [#10995](https://github.com/mixxxdj/mixxx/issues/10995)
-* Soundtouch latency compensation updated for version 2.1.1 to 2.3
+  [#11504](https://github.com/mixxxdj/mixxx/issues/11504)
+* Update latency compensation for Soundtouch version 2.1.1 to 2.3
   [#11154](https://github.com/mixxxdj/mixxx/pull/11154)
 
 ## [2.3.5](https://github.com/mixxxdj/mixxx/milestone/39) (2023-05-10)
diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index ef25f684fb1..a946142c744 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -98,7 +98,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.3.6" type="development" date="2023-08-09" timestamp="1691579298">
+    <release version="2.3.6" type="development" date="2023-08-12" timestamp="1691794541">
       <description>
  <ul>
   <li>
@@ -200,12 +200,12 @@
    #10995
   </li>
   <li>
-   Allow playing tracks with durations of more than 6 h
+   Allow playing tracks with durations of more than 6 hours
    #11511
-   #10995
+   #11504
   </li>
   <li>
-   Soundtouch latency compensation updated for version 2.1.1 to 2.3
+   Update latency compensation for Soundtouch version 2.1.1 to 2.3
    #11154
   </li>
  </ul>