From c8124495d2f02029f1a04b31e6a5aa2f64fa9b1b Mon Sep 17 00:00:00 2001 From: Robert Kausch Date: Sun, 29 Mar 2020 18:51:05 +0200 Subject: [PATCH] Prepare v1.1 release. --- Readme | 1 + Readme.de | 1 + metadata/org.freac.freac.appdata.xml | 9 +++++++++ packaging/macosx/freac.app/Contents/Info.plist | 2 +- packaging/macosx/package.sh | 6 +++--- packaging/macosx/prepare.sh | 4 ++-- packaging/windows/setup.xml | 2 +- resources/resources.rc | 6 +++--- resources/resources_vd.rc | 6 +++--- snap/snapcraft.yaml | 4 ++-- src/freac.cpp | 6 +++--- 11 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Readme b/Readme index 3c33159ff..e3ec00095 100644 --- a/Readme +++ b/Readme @@ -153,6 +153,7 @@ History - Fixed parallel processing being active for CD track reference files on Windows - Fixed freaccmd ejecting the CD after ripping 1 track with eject option is enabled in fre:ac + - Fixed crash of freaccmd when DISPLAY variable is not set on Linux/FreeBSD Version 1.1 RC 2 (March 2020) diff --git a/Readme.de b/Readme.de index 7770f6daa..0aa18d0bc 100644 --- a/Readme.de +++ b/Readme.de @@ -153,6 +153,7 @@ Geschichte - Problem mit aktiver Parallelverarbeitung für CD-Track-Referenzdateien unter Windows behoben - Problem mit Auswurf der CD nach dem Rippen eines Tracks in freaccmd bei aktivierter Auswurf-Option in fre:ac behoben + - Absturz von freaccmd bei nicht gesetzter DISPLAY-Variable unter Linux/FreeBSD behoben Version 1.1 RC 2 (März 2020) diff --git a/metadata/org.freac.freac.appdata.xml b/metadata/org.freac.freac.appdata.xml index f75c2c5b8..ae4f87d4e 100644 --- a/metadata/org.freac.freac.appdata.xml +++ b/metadata/org.freac.freac.appdata.xml @@ -47,6 +47,15 @@ + + +

Bug fixes:

+
    +
  • Fixed freaccmd ejecting the CD after ripping 1 track with eject option is enabled in fre:ac
    • +
  • Fixed crash of freaccmd when DISPLAY variable is not set
    • +
+ +

Bug fixes:

diff --git a/packaging/macosx/freac.app/Contents/Info.plist b/packaging/macosx/freac.app/Contents/Info.plist index 9558bbbb2..199209960 100644 --- a/packaging/macosx/freac.app/Contents/Info.plist +++ b/packaging/macosx/freac.app/Contents/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature f:ac CFBundleVersion - 1.1.0.5160 + 1.1.0.5163 CFBundleShortVersionString 1.1.0 LSBackgroundOnly diff --git a/packaging/macosx/package.sh b/packaging/macosx/package.sh index a1671b5d0..92da03c13 100644 --- a/packaging/macosx/package.sh +++ b/packaging/macosx/package.sh @@ -1,9 +1,9 @@ #!/bin/bash -#RELEASE=1.1-rc2 -RELEASE=1.1-rc-`date +"%Y%m%d"` +RELEASE=1.1 +#RELEASE=1.1-`date +"%Y%m%d"` -VERSION="v1.1 RC 2" +VERSION="v1.1" UNAME=macosx diff --git a/packaging/macosx/prepare.sh b/packaging/macosx/prepare.sh index 11594f8d6..9b26b3d0d 100644 --- a/packaging/macosx/prepare.sh +++ b/packaging/macosx/prepare.sh @@ -1,8 +1,8 @@ #!/bin/bash PREFIX=/usr/local -#RELEASE=1.1-rc2 -RELEASE=1.1-rc-`date +"%Y%m%d"` +RELEASE=1.1 +#RELEASE=1.1-`date +"%Y%m%d"` SMOOTHVER=0.9.0 BOCAVER=1.0.2 diff --git a/packaging/windows/setup.xml b/packaging/windows/setup.xml index 31439b270..0d932c402 100644 --- a/packaging/windows/setup.xml +++ b/packaging/windows/setup.xml @@ -7,7 +7,7 @@ fre:ac fre:ac - free audio converter - v1.1 RC 2 + v1.1 setup.pci:0 diff --git a/resources/resources.rc b/resources/resources.rc index bef21ba82..56e09c067 100644 --- a/resources/resources.rc +++ b/resources/resources.rc @@ -2,8 +2,8 @@ #include "../include/resources.h" IDR_VERSION VERSIONINFO - FILEVERSION 1,1,0,5160 - PRODUCTVERSION 1,1,0,5160 + FILEVERSION 1,1,0,5163 + PRODUCTVERSION 1,1,0,5163 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.5160\0" + VALUE "FileVersion", "1.1.0.5163\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 4b3cfc862..8777e1dd1 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,5160 - PRODUCTVERSION 1,1,0,5160 + FILEVERSION 1,1,0,5163 + PRODUCTVERSION 1,1,0,5163 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.5160\0" + VALUE "FileVersion", "1.1.0.5163\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 da633dfad..fef7797c8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,7 +1,7 @@ name: freac base: core18 -version: '1.1~rc2' -version-script: echo 1.1~rc`date +"%Y%m%d"` +version: '1.1' +#version-script: echo 1.1~`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 a23295f89..499446b29 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 RC (" FREAC_DATE ")"; +String freac::freac::version = "v1.1";// (" FREAC_DATE ")"; # else -String freac::freac::version = "v1.1 RC 2"; +String freac::freac::version = "v1.1"; # endif #endif @@ -66,7 +66,7 @@ String freac::freac::architecture = "unknown"; #endif String freac::freac::shortVersion = "v1.1"; -String freac::freac::cddbVersion = "v1.1rc2"; // CDDB version may not contain spaces +String freac::freac::cddbVersion = "v1.1"; // CDDB version may not contain spaces String freac::freac::cddbMode = "submit"; String freac::freac::copyright = "Copyright (C) 2001-2020 Robert Kausch";