Merge branch 'master' into arm64

2022-09-01 16:32:50 +01:00
parent fb582e2e67 7206ab1c22
commit 4e9aaac41e
15 changed files with 54 additions and 11 deletions
--- a/stage5/00-install-extras/00-packages
+++ b/stage5/00-install-extras/00-packages
@@ -7,7 +7,7 @@ python3-sense-emu sense-emu-tools python-sense-emu-doc

 #wolfram-engine
 claws-mail
-greenfoot-unbundled bluej
+greenfoot-unbundled bluej-unbundled
 #nodered
 realvnc-vnc-viewer

--- a/stage5/00-install-libreoffice/00-packages
+++ b/stage5/00-install-libreoffice/00-packages
@@ -1,3 +1,3 @@
-libreoffice-pi
+libreoffice-pi openjdk-11-jre-
 libreoffice-help-en-gb
 libreoffice-l10n-en-gb