From 644d900a1cfcee7ff35836c1793ad1e3000f3630 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Thu, 10 Sep 2020 11:55:20 -0700 Subject: [PATCH 1/3] Make Release Notes link to translated pages a hyperlink --- Htmldocs/release_notes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html index e6cd8d8e..1fd701b5 100644 --- a/Htmldocs/release_notes.html +++ b/Htmldocs/release_notes.html @@ -9,7 +9,7 @@

For other languages, go to: -
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

+
http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes

Changes and fixes in OSCAR v1.2.0-beta-2
Portions of OSCAR are © 2019-2020 by From 249144a4a406df7969f3f2a9555902752da93eed Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Thu, 10 Sep 2020 19:20:30 -0400 Subject: [PATCH 2/3] Update version to v1.2.0-beta-2 --- oscar/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oscar/VERSION b/oscar/VERSION index 3565f3f7..40d79cd1 100644 --- a/oscar/VERSION +++ b/oscar/VERSION @@ -1,5 +1,5 @@ // Update the string below to set OSCAR's version and release status. // See https://semver.org/spec/v2.0.0.html for details on format. -#define VERSION "1.2.0-beta-1" +#define VERSION "1.2.0-beta-2" From 4c8c6682de3c971d6956fc5ebc3c748d66f1d876 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sat, 12 Sep 2020 13:30:02 -0400 Subject: [PATCH 3/3] Add license phrase and fix qt5 dependecy --- Building/Linux/mkDistDeb.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Building/Linux/mkDistDeb.sh b/Building/Linux/mkDistDeb.sh index c5efed59..84f5816f 100755 --- a/Building/Linux/mkDistDeb.sh +++ b/Building/Linux/mkDistDeb.sh @@ -163,6 +163,7 @@ fpm --input-type dir --output-type deb \ --category misc \ --deb-priority optional \ --maintainer " -- oscar-team.org " \ + --license GPL3+ --vendor oscar-team.org \ --description "$description" \ --url https://sleepfiles.com/OSCAR \ @@ -170,7 +171,7 @@ fpm --input-type dir --output-type deb \ --depends $dblPkg \ --depends libpcre16-3 \ --depends qttranslations5-l10n \ - --depends "libqt5core5a > 5.9" \ + --depends "libqt5core5a >= 5.9" \ --depends libqt5serialport5 \ --depends libqt5xml5 \ --depends libqt5network5 \