From a031108052f97059066b93f7548542e8b63d4a5b Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 9 Jun 2021 18:06:37 +0100
Subject: [PATCH] =?utf8?q?JAL-3842=202.11.1.5=20what=E2=80=99s=20new,=20rele?=
 =?utf8?q?ase=20notes,=20and=20version=20bump?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 RELEASE                      |    2 +-
 help/help/html/releases.html |  112 ++++++++++++++++++++++++++----------------
 help/help/html/whatsNew.html |    5 ++
 3 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/RELEASE b/RELEASE
index 70a7383..1acd0a7 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
 jalview.release=releases/Release_2_11_1_Branch
-jalview.version=2.11.1.4
+jalview.version=2.11.1.5
diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 9b31671..353dd46 100755
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -56,48 +56,76 @@ li:before {
       <th><em>New Features</em></th>
       <th><em>Issues Resolved</em></th>
     </tr>
-    <td width="60" align="center" nowrap><strong><a
-        id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.4">.4</a><br />
-        <em>09/03/2021</em></strong></td>
-    <td align="left" valign="top"><em>Improved control of
-        Jalview's use of network services via jalview_properties</em>
-      <ul>
-        <li>
-          <!-- JAL-3814 -->New .jalview_properties token controlling
-          launch of the news browser (like -nonews argument)
-        </li>
-        <li>
-          <!-- JAL-3813 -->New .jalview_properties token controlling
-          download of linkout URLs from
-          www.jalview.org/services/identifiers
-        </li>
-        <li>
-          <!-- JAL-3812 -->New .jalview_properties token controlling
-          download of BIOJSHTML templates
-        </li>
-        <li>
-          <!-- JAL-3811 -->New 'Discover Web Services' option to trigger
-          a one off JABAWS discovery if autodiscovery was disabled
-        </li>
-      </ul></td>
-    <td align="left" valign="top">
-      <ul>
-        <li>
-          <!-- JAL-3818 -->Intermittent deadlock opening structure in
-          Jmol
-        </li>
-      </ul> <em>New Known defects</em>
-      <ul>
-        <li>
-          <!-- JAL-3705 -->Protein Cross-Refs for Gene Sequence not
-          always restored from project (since 2.10.3)
-        </li>
-        <li>
-          <!-- JAL-3806 -->Selections from tree built from CDS aren't
-          propagated to Protein alignment (since 2.11.1.3)
-        </li>
-      </ul>
-    </td>
+    <tr>
+      <td width="60" align="center" nowrap><strong><a
+          id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.5">.5</a><br />
+          <em>22/06/2021</em></strong></td>
+      <td align="left" valign="top"><em>Development</em>
+        <ul>
+          <li>Updated building instructions</li>
+        </ul></td>
+      <td>
+        <ul>
+          <li>
+            <!-- JAL-3840 -->Occupancy calculation is incorrect for
+            alignment columns with over -1+2^32 gaps (breaking filtering
+            and display)
+          </li>
+          <li>
+            <!-- JAL-3833 -->Caps on Hi-DPI scaling to prevent crazy
+            scale factors being set with buggy window-managers (linux
+            only)
+          </li>
+        </ul> <em>Development</em>
+        <ul>
+          <li>Fixed non-fatal gradle errors during build</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td width="60" align="center" nowrap><strong><a
+          id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.4">.4</a><br />
+          <em>09/03/2021</em></strong></td>
+      <td align="left" valign="top"><em>Improved control of
+          Jalview's use of network services via jalview_properties</em>
+        <ul>
+          <li>
+            <!-- JAL-3814 -->New .jalview_properties token controlling
+            launch of the news browser (like -nonews argument)
+          </li>
+          <li>
+            <!-- JAL-3813 -->New .jalview_properties token controlling
+            download of linkout URLs from
+            www.jalview.org/services/identifiers
+          </li>
+          <li>
+            <!-- JAL-3812 -->New .jalview_properties token controlling
+            download of BIOJSHTML templates
+          </li>
+          <li>
+            <!-- JAL-3811 -->New 'Discover Web Services' option to
+            trigger a one off JABAWS discovery if autodiscovery was
+            disabled
+          </li>
+        </ul></td>
+      <td align="left" valign="top">
+        <ul>
+          <li>
+            <!-- JAL-3818 -->Intermittent deadlock opening structure in
+            Jmol
+          </li>
+        </ul> <em>New Known defects</em>
+        <ul>
+          <li>
+            <!-- JAL-3705 -->Protein Cross-Refs for Gene Sequence not
+            always restored from project (since 2.10.3)
+          </li>
+          <li>
+            <!-- JAL-3806 -->Selections from tree built from CDS aren't
+            propagated to Protein alignment (since 2.11.1.3)
+          </li>
+        </ul>
+      </td>
     </tr>
     <tr>
       <td width="60" align="center" nowrap><strong><a
diff --git a/help/help/html/whatsNew.html b/help/help/html/whatsNew.html
index 4c57012..5928170 100755
--- a/help/help/html/whatsNew.html
+++ b/help/help/html/whatsNew.html
@@ -24,6 +24,11 @@
 </head>
 <body>
   <p>
+    Welcome to Jalview Version $$Version-Rel$$ !!<br />Please take a
+    look at the <a href="releases.html#$$Version-Rel$$">release
+      notes</a> for this build.
+  </p>
+  <p>
     <strong>Jalview 2.11.1.4</strong>
   </p>
   <p>Jalview 2.11.1.4 is the fourth patch release in the 2.11.1
-- 
1.7.10.2