From ce249b4799829303806a75ccaf5f7f137ca7d542 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Thu, 24 Sep 2020 20:36:54 -0700
Subject: [PATCH 1/2] Release notes for OSCAR 1.2.0-rc-1

---
 Htmldocs/release_notes.html | 43 ++++++++++---------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index d59b9cea..f532feb8 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -11,55 +11,28 @@
     <b>For other languages, go to:</b>
     <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-3</b>
-    <br>Portions of OSCAR are © 2019-2020 by
-    <i>The OSCAR Team</i></p>
-    <ul>
-      <li>[new] Additional Philips Respironics devices tested and fully supported:
-        <ul>
-          <li>REMstar Pro (System One) (450P V1)</li>
-          <li>Dorma 500 Auto (System One 60 Series) (501V)</li>
-        </ul>
-      </li>
-      <li>[fix] Improve support of rare Philips Respironics 1030X events and update warnings.</li>
-      <li>[fix] Profile page and Daily records block now shows most recently used machine when a profile has multiple machines.</li>
-      <li>[fix] Corrected error in beta-1and 2 where date last imported was lost.</li>
-      <li>[fix] Translations updated.</li>
-    </ul></p>
-    <p>
-    <b>Changes and fixes in OSCAR v1.2.0-beta-2</b>
-    <br>Portions of OSCAR are © 2019-2020 by
-    <i>The OSCAR Team</i></p>
-    <ul>
-      <li>[fix] Support migration from both SleepyHead and OSCAR.</li>
-      <li>[fix] Correct 95th percentile computations on Statistics page when some days were summary-only.</li>
-      <li>[fix] Improve some prompts and tooltip messages.</li>
-      <li>[fix] Improve support of rare Philips Respironics 950P events and update warnings.</li>
-      <li>[fix] Empty directories in Profiles directory are not shown in Profiles list.</li>
-      <li>[fix] Show correct copyright when installing Debian version.</li>
-      <li>[fix] Improvements to Chromebook identification.</li>
-    </ul></p>
-    <p>
-    <b>Changes and fixes in OSCAR v1.2.0-beta-1</b>
+    <b>Changes and fixes in OSCAR v1.2.0-rc-1</b>
     <br>Portions of OSCAR are © 2019-2020 by
     <i>The OSCAR Team</i></p>    <ul>
       <li>[new] Support for Chromebooks using Linux beta - (Intel/AMD only)</li>
       <li>[new] Support for Raspberry Pi OS</li>
       <li>[new] Additional Philips Respironics devices tested and fully supported:
         <ul>
-          <li>REMstar Pro (System One) (452P)</li>
+          <li>REMstar Pro (System One) (452P, 450P V1)</li>
           <li>BiPAP Pro (System One) (650P)</li>
           <li>REMstar Plus (System One 60 Series) (261CA)</li>
           <li>REMstar Pro (System One 60 Series) (462P)</li>
           <li>DreamStation CPAP Pro (400X120)</li>
           <li>DreamStation BiPAP autoSV (900X150)</li>
+          <li>Dorma 500 Auto (System One 60 Series) (501V)</li>
         </ul>
       <li>[new] OSCAR checks automatically for new releases.</li>
       <li>[new] Privacy feature allows suppressing profile info in Statistics page and printed reports.</li>
       <li>[new] Add option to print reports in black and white (monochrome).</li>
       <li>[new] Hold down the Shift key while selecting a range on a chart to measure the duration without zooming.</li>
       <li>[new] Allow second (or more) import on same day for ResMed data.</li>
-      <li>[fix] Improve support for rare events in 50-series Philips Respironics devices.</li>
+      <li>[fix] Improve support of rare events and update warnings in Philips Respironics 950P, 1030X, and 50-series.</li>
+      <li>[fix] Profile page and Daily records block now show most recently used machine when a profile has multiple machines.</li>
       <li>[fix] Improve warning on Daily page when settings are missing.</li>
       <li>[fix] No longer zoom charts to maximum when clicking on chart with popup menu present.</li>
       <li>[fix] Correct page margins problem when printing Statistics page on Mac.</li>
@@ -77,6 +50,12 @@
       <li>[fix] Correct pressure reported on Welcome page for VAuto-S machines.</li>
       <li>[fix] Improve error checking for file system problems.</li>
       <li>[fix] ResMed machines now show the Essentials setting.</li>
+      <li>[fix] Support migration from both SleepyHead and OSCAR.</li>
+      <li>[fix] Correct 95th percentile computations on Statistics page when some days were summary-only.</li>
+      <li>[fix] Improve some prompts and tooltip messages.</li>
+      <li>[fix] Empty directories in Profiles directory are not shown in Profiles list.</li>
+      <li>[fix] Show correct copyright when installing Debian version.</li>
+      <li>[fix] Translations updated.</li>
     </ul>
     <p>
     <b>Changes and fixes in OSCAR v1.1.1</b>

From e4b3b97c214a26c1d9c1a09fba49b1b322b9f466 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Fri, 25 Sep 2020 13:03:40 -0400
Subject: [PATCH 2/2] Change VERSION to v1.2.0-rc.1 - use dot as pre-release
 separator

---
 Htmldocs/release_notes.html | 2 +-
 oscar/VERSION               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Htmldocs/release_notes.html b/Htmldocs/release_notes.html
index f532feb8..1f37a748 100644
--- a/Htmldocs/release_notes.html
+++ b/Htmldocs/release_notes.html
@@ -11,7 +11,7 @@
     <b>For other languages, go to:</b>
     <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-rc-1</b>
+    <b>Changes and fixes in OSCAR v1.2.0-rc.1</b>
     <br>Portions of OSCAR are © 2019-2020 by
     <i>The OSCAR Team</i></p>    <ul>
       <li>[new] Support for Chromebooks using Linux beta - (Intel/AMD only)</li>
diff --git a/oscar/VERSION b/oscar/VERSION
index ba9015f9..7bbd4b1d 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-3"
+#define VERSION "1.2.0-rc.1"