From 9d9d0637909a506c82cb76cea90a94a958b1732c Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Thu, 7 Sep 2023 12:59:39 +0100
Subject: [PATCH] Remove/replace obsolete packages

---
 stage2/01-sys-tweaks/00-packages          | 6 +++---
 stage3/00-install-packages/00-packages-nr | 2 +-
 stage4/00-install-packages/00-packages    | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 6138c6d..86bdd9d 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -1,4 +1,4 @@
-ssh less fbset sudo psmisc strace ed ncdu crda
+ssh less fbset sudo psmisc strace ed ncdu
 console-setup keyboard-configuration debconf-utils parted
 build-essential manpages-dev bash-completion gdb pkg-config
 python-is-python3
@@ -7,7 +7,7 @@ python3-gpiozero
 avahi-daemon
 lua5.1
 luajit
-hardlink ca-certificates curl
+ca-certificates curl
 fake-hwclock nfs-common usbutils
 libraspberrypi-dev libraspberrypi-doc libfreetype6-dev
 dosfstools
@@ -29,7 +29,7 @@ ethtool
 ntfs-3g
 pciutils
 rpi-eeprom
-raspinfo
+raspi-utils
 udisks2
 unzip zip p7zip-full
 file
diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr
index 75fa2a1..9113198 100644
--- a/stage3/00-install-packages/00-packages-nr
+++ b/stage3/00-install-packages/00-packages-nr
@@ -3,5 +3,5 @@ mousepad
 lxde lxtask menu-xdg
 zenity xdg-utils
 gvfs-backends gvfs-fuse
-lightdm gnome-themes-standard-data gnome-icon-theme
+lightdm gnome-themes-extra-data gnome-icon-theme
 gnome-keyring
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 7854596..bfb3f0d 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -2,12 +2,10 @@ python3-pygame
 python3-tk thonny
 python3-pgzero
 python3-serial
-python3-picamera
 debian-reference-en dillo
 raspberrypi-net-mods raspberrypi-ui-mods
 python3-pip
 python3-numpy
-pypy
 alacarte rc-gui sense-hat
 tree
 libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
@@ -24,4 +22,3 @@ rp-prefapps
 ffmpeg
 vlc
 rpi-imager
-rpi-wayland