From 1445894c2e03c88701d1cca4aed9a8f82c41f4a1 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Tue, 5 Jun 2018 16:03:52 +0100
Subject: [PATCH] stage4: Add piwiz and rp-prefapps

Remove claws-mail, greenfoot, bluej, nodered & realvnc-vnc-server
---
 stage4/00-install-packages/00-packages    | 5 ++---
 stage4/00-install-packages/00-packages-nr | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index d3f40ef..7088b27 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -14,11 +14,8 @@ python3-numpy
 pypy
 minecraft-pi python-minecraftpi
 alacarte rc-gui sense-hat
-claws-mail
 tree
 scratch nuscratch
-greenfoot bluej
-nodered
 libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr
 geany
 piclone
@@ -32,3 +29,5 @@ python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
 pprompt
 scratch2
 python3-thonny
+piwiz
+rp-prefapps
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
index 561403c..7ea2a5e 100644
--- a/stage4/00-install-packages/00-packages-nr
+++ b/stage4/00-install-packages/00-packages-nr
@@ -1,4 +1,4 @@
 libreoffice libreoffice-gtk
 timidity
 pi-package
-realvnc-vnc-server realvnc-vnc-viewer
+realvnc-vnc-server