From c91d03e9fe95fda7183ad2f6a8d9cd6609349bbe Mon Sep 17 00:00:00 2001
From: Robert Kausch <robert.kausch@freac.org>
Date: Sun, 12 Jan 2020 18:24:23 +0100
Subject: [PATCH] Prepare v1.1 beta 2 release.

---
 metadata/org.freac.freac.appdata.xml | 25 ++++++++++++++++++++++++-
 packaging/windows/setup.xml          |  2 +-
 resources/resources.rc               |  6 +++---
 resources/resources_vd.rc            |  6 +++---
 snap/snapcraft.yaml                  |  4 ++--
 src/freac.cpp                        |  6 +++---
 6 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/metadata/org.freac.freac.appdata.xml b/metadata/org.freac.freac.appdata.xml
index b4bcc89aa..f749da2cf 100644
--- a/metadata/org.freac.freac.appdata.xml
+++ b/metadata/org.freac.freac.appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 Robert Kausch -->
+<!-- Copyright 2020 Robert Kausch -->
 <component type="desktop-application">
     <id>org.freac.freac</id>
     <launchable type="desktop-id">org.freac.freac.desktop</launchable>
@@ -47,6 +47,29 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="1.1~beta2" date="2020-01-12">
+            <description>
+                <p>Improvements:</p>
+                <ul>
+                    <li>Log names of active DSP components</li>
+                    <li>Log total duration and speed of conversions</li>
+                </ul>
+                <p>Bug fixes:</p>
+                <ul>
+                   <li>Fixed an IO subsystem issue causing corrupted output files in some cases</li>
+                   <li>Fixed SuperFast LAME repacker causing glitches in output files in some cases</li>
+                   <li>Fixed gapless decoding of MP3 files created with FFmpeg</li>
+                   <li>Fixed inability to update ID3v2 and APEv2 tags in tag editor</li>
+                   <li>Fixed inability to exit application after ejecting a disc while ripping</li>
+                   <li>Fixed hangup when ejecting a disc while adding its tracks to joblist</li>
+                   <li>Fixed minimum and maximum bitrate values being mixed up in Vorbis configuration dialog</li>
+                </ul>
+                <p>Updated translations:</p>
+                <ul>
+                    <li>Updated Dutch translation</li>
+                </ul>
+            </description>
+        </release>
         <release version="1.1~beta1" date="2019-12-15">
             <description>
                 <p>New features:</p>
diff --git a/packaging/windows/setup.xml b/packaging/windows/setup.xml
index e197be44d..14f4994c6 100644
--- a/packaging/windows/setup.xml
+++ b/packaging/windows/setup.xml
@@ -7,7 +7,7 @@
   <application>
     <name>fre:ac</name>
     <longname>fre:ac - free audio converter</longname>
-    <version>v1.1 Beta 1</version>
+    <version>v1.1 Beta 2</version>
     <logo>setup.pci:0</logo>
   </application>
   <uninstall createLog="true">
diff --git a/resources/resources.rc b/resources/resources.rc
index 01e892312..096378096 100644
--- a/resources/resources.rc
+++ b/resources/resources.rc
@@ -2,8 +2,8 @@
 #include "../include/resources.h"
 
 IDR_VERSION		VERSIONINFO
-  FILEVERSION		1,1,0,5052
-  PRODUCTVERSION	1,1,0,5052
+  FILEVERSION		1,1,0,5059
+  PRODUCTVERSION	1,1,0,5059
   FILEOS		VOS_NT_WINDOWS32
   FILETYPE		VFT_APP
 BEGIN
@@ -12,7 +12,7 @@ BEGIN
         BLOCK "000004B0"	// Block: language ID = Multilingual, char set = Unicode
         BEGIN
             VALUE	"FileDescription",	"fre:ac - free audio converter\0"
-            VALUE	"FileVersion",		"1.1.0.5052\0"
+            VALUE	"FileVersion",		"1.1.0.5059\0"
             VALUE	"InternalName",		"FREAC\0"
             VALUE	"OriginalFilename",	"freac.exe\0"
             VALUE	"ProductName",		"fre:ac\0"
diff --git a/resources/resources_vd.rc b/resources/resources_vd.rc
index bfa2eb270..1b57cb4e5 100644
--- a/resources/resources_vd.rc
+++ b/resources/resources_vd.rc
@@ -2,8 +2,8 @@
 #include "../include/resources.h"
 
 IDR_VERSION		VERSIONINFO
-  FILEVERSION		1,1,0,5052
-  PRODUCTVERSION	1,1,0,5052
+  FILEVERSION		1,1,0,5059
+  PRODUCTVERSION	1,1,0,5059
   FILEOS		VOS_NT_WINDOWS32
   FILETYPE		VFT_APP
 BEGIN
@@ -12,7 +12,7 @@ BEGIN
         BLOCK "000004B0"	// Block: language ID = Multilingual, char set = Unicode
         BEGIN
             VALUE	"FileDescription",	"fre:ac - free video downloader\0"
-            VALUE	"FileVersion",		"1.1.0.5052\0"
+            VALUE	"FileVersion",		"1.1.0.5059\0"
             VALUE	"InternalName",		"FREAC\0"
             VALUE	"OriginalFilename",	"freac.exe\0"
             VALUE	"ProductName",		"fre:ac\0"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8b78f8374..128436cdd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: freac
-version: '1.1~beta1'
-version-script: echo 1.1~beta`date +"%Y%m%d"`
+version: '1.1~beta2'
+#version-script: echo 1.1~beta`date +"%Y%m%d"`
 summary: Audio converter and CD ripper
 description: |
   fre:ac is a free and open source audio converter. It comes with
diff --git a/src/freac.cpp b/src/freac.cpp
index 7afe569ec..ff2e5d91a 100644
--- a/src/freac.cpp
+++ b/src/freac.cpp
@@ -41,9 +41,9 @@ String	 freac::freac::appLongName    = "fre:ac - free video downloader";
 String	 freac::freac::version	      = FREAC_VERSION;
 #else
 #	ifdef FREAC_DATE
-String	 freac::freac::version	      = "v1.1 Beta 1 (" FREAC_DATE ")";
+String	 freac::freac::version	      = "v1.1 Beta 2"; // (" FREAC_DATE ")";
 #	else
-String	 freac::freac::version	      = "v1.1 Beta 1";
+String	 freac::freac::version	      = "v1.1 Beta 2";
 #	endif
 #endif
 
@@ -66,7 +66,7 @@ String	 freac::freac::architecture   = "unknown";
 #endif
 
 String	 freac::freac::shortVersion   = "v1.1";
-String	 freac::freac::cddbVersion    = "v1.1beta1"; // CDDB version may not contain spaces
+String	 freac::freac::cddbVersion    = "v1.1beta2"; // CDDB version may not contain spaces
 String	 freac::freac::cddbMode	      = "submit";
 
 String	 freac::freac::copyright      = "Copyright (C) 2001-2020 Robert Kausch";