chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Arie Klerk 2020-09-12 20:28:01 +02:00
commit ce67d16c42
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Building/Linux/mkDistDeb.sh
View File

@ -163,6 +163,7 @@ fpm --input-type dir --output-type deb \
--category misc \
--deb-priority optional \
--maintainer " -- oscar-team.org <oscar@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 \

2
Htmldocs/release_notes.html
View File

@ -9,7 +9,7 @@
<body>
<p>
<b>For other languages, go to:</b>
<br>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</p>
<br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
<p>
<b>Changes and fixes in OSCAR v1.2.0-beta-2</b>
<br>Portions of OSCAR are © 2019-2020 by

2
oscar/VERSION
View File

@ -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"