From 783cf7f1b0170e12186f1c8754eb4ff6e8d47e53 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 7 Jun 2020 23:49:11 +0200
Subject: [PATCH] Release 0.6.12

---
 Changelog           | 13 +++++++++++++
 cmake/Version.cmake |  4 ++--
 snap/snapcraft.yaml |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 8b6af93df..0b3c5d4b1 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,19 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+0.6.12:
+
+  Bugfixes:
+    * Fixed height of about dialog.
+
+  Enhancements:
+    * Only save settings for pages that actually has been changed.
+    * Replaced use of deprecated Qt functionality as of 5.15.
+    * Made scrobbler show error dialog for all errors when show error dialog option is on.
+    * Dont append disc to album titles for Subsonic and Tidal.
+    * Sort folders added from file view.
+    * Changed default collection grouping to album - disc.
+
 0.6.11:
 
   Bugfixes:
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index c9b4294e3..20a7617a4 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,9 +1,9 @@
 set(STRAWBERRY_VERSION_MAJOR 0)
 set(STRAWBERRY_VERSION_MINOR 6)
-set(STRAWBERRY_VERSION_PATCH 11)
+set(STRAWBERRY_VERSION_PATCH 12)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
-set(INCLUDE_GIT_REVISION ON)
+set(INCLUDE_GIT_REVISION OFF)
 
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c2e444cc3..9a0f87818 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: strawberry
-version: '0.6.11+git'
+version: '0.6.12+git'
 summary: music player and collection organizer
 description: |
   Strawberry is a music player and collection organizer.