Merge e27bf7373f into 9a3a10bf10

stage1/03-install-packages/00-packages

@@ -1 +1,3 @@
-libraspberrypi-bin libraspberrypi0 raspi-config
+libraspberrypi-bin
+libraspberrypi0
+raspi-config

stage2/01-sys-tweaks/00-packages

@@ -1,31 +1,55 @@
-ssh less fbset sudo psmisc strace ed ncdu crda
-console-setup keyboard-configuration debconf-utils parted unzip
-build-essential manpages-dev python bash-completion gdb pkg-config
-python-rpi.gpio v4l-utils
+apt-listchanges
 avahi-daemon
-lua5.1
-luajit
-hardlink ca-certificates curl
-fake-hwclock nfs-common usbutils
-libraspberrypi-dev libraspberrypi-doc libfreetype6-dev
+bash-completion
+build-essential
+ca-certificates
+console-setup
+crda
+curl
+debconf-utils
 dosfstools
 dphys-swapfile
-raspberrypi-sys-mods
-pi-bluetooth
-apt-listchanges
-usb-modeswitch
-libpam-chksshpwd
-rpi-update
-libmtp-runtime
-rsync
-htop
-man-db
-policykit-1
-ssh-import-id
-rng-tools
+ed
 ethtool
-vl805fw
+fake-hwclock
+fbset
+gdb
+hardlink
+htop
+keyboard-configuration
+less
+libfreetype6-dev
+libmtp-runtime
+libpam-chksshpwd
+libraspberrypi-dev
+libraspberrypi-doc
+lua5.1
+luajit
+man-db
+manpages-dev
+ncdu
+nfs-common
 ntfs-3g
+parted
 pciutils
-rpi-eeprom
+pi-bluetooth
+pkg-config
+policykit-1
+psmisc
+python
+python-rpi.gpio
+raspberrypi-sys-mods
 raspinfo
+rng-tools
+rpi-eeprom
+rpi-update
+rsync
+ssh
+ssh-import-id
+strace
+sudo
+unzip
+usb-modeswitch
+usbutils
+v4l-utils
+vl805fw

stage2/02-net-tweaks/00-packages

@@ -1,4 +1,10 @@
-wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek
-raspberrypi-net-mods
 dhcpcd5
+firmware-atheros
+firmware-brcm80211
+firmware-libertas
+firmware-misc-nonfree
+firmware-realtek
 net-tools
+raspberrypi-net-mods
+wireless-tools
+wpasupplicant

stage3/00-install-packages/00-packages

@@ -1,15 +1,24 @@
-gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
-qpdfview gtk2-engines alsa-utils
+alsa-utils
+arandr
+chromium-browser
 desktop-base
-git
-omxplayer
-raspberrypi-artwork
-policykit-1
-gvfs
-rfkill
-chromium-browser rpi-chromium-mods
-gldriver-test
 fonts-droid-fallback
 fonts-liberation2
+git
+gldriver-test
+gstreamer1.0-alsa
+gstreamer1.0-libav
+gstreamer1.0-omx
+gstreamer1.0-plugins-bad
+gstreamer1.0-plugins-base
+gstreamer1.0-plugins-good
+gstreamer1.0-x
+gtk2-engines
+gvfs
 obconf
-arandr
+omxplayer
+policykit-1
+qpdfview
+raspberrypi-artwork
+rfkill
+rpi-chromium-mods

stage3/00-install-packages/00-packages-nr

@@ -1,6 +1,15 @@
-xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo
+gnome-icon-theme
+gnome-themes-standard-data
+gvfs-backends
+gvfs-fuse
+lightdm
+lxde
+lxtask
+menu-xdg
 mousepad
-lxde lxtask menu-xdg
-zenity xdg-utils
-gvfs-backends gvfs-fuse
-lightdm gnome-themes-standard-data gnome-icon-theme
+xdg-utils
+xinit
+xserver-xorg
+xserver-xorg-video-fbdev
+xserver-xorg-video-fbturbo
+zenity

stage4/00-install-packages/00-packages

@@ -1,25 +1,51 @@
-python python3-pygame python-pygame python-tk
-python3 python3-tk thonny
-python3-pgzero
-python-serial python3-serial
-python-picamera python3-picamera
-debian-reference-en dillo
-raspberrypi-net-mods raspberrypi-ui-mods
-python-pip python3-pip
-python3-numpy
-pypy
-alacarte rc-gui sense-hat
-tree
-libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
-geany
-piclone
-wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio
-python-spidev python3-spidev
-python-twython python3-twython
-python-smbus python3-smbus
-python-flask python3-flask
-pprompt
-piwiz
-rp-prefapps
+alacarte
+debian-reference-en
+dillo
 ffmpeg
+geany
+libgl1-mesa-dri
+libgles1
+libgles2-mesa
+piclone
+pigpio
+piwiz
+pprompt
+pypy
+python
+python-flask
+python-gpiozero
+python-picamera
+python-pigpio
+python-pip
+python-pygame
+python-serial
+python-smbus
+python-spidev
+python-tk
+python-twython
+python3
+python3-flask
+python3-gpiozero
+python3-numpy
+python3-pgzero
+python3-picamera
+python3-pigpio
+python3-pip
+python3-pygame
+python3-rpi.gpio
+python3-serial
+python3-smbus
+python3-spidev
+python3-tk
+python3-twython
+raspberrypi-net-mods
+raspberrypi-ui-mods
+raspi-gpio
+rc-gui
+rp-prefapps
+sense-hat
+thonny
+tree
 vlc
+wiringpi
+xcompmgr

stage4/00-install-packages/01-packages

@@ -1,5 +1,6 @@
 python-automationhat python3-automationhat
 python-blinkt python3-blinkt
+python-buttonshim python3-buttonshim
 python-cap1xxx python3-cap1xxx
 python-drumhat python3-drumhat
 python-envirophat python3-envirophat
@@ -8,15 +9,14 @@ python-fourletterphat python3-fourletterphat
 python-microdotphat python3-microdotphat
 python-mote python3-mote
 python-motephat python3-motephat
+python-pantilthat python3-pantilthat
 python-phatbeat python3-phatbeat
 python-pianohat python3-pianohat
 python-piglow python3-piglow
 python-rainbowhat python3-rainbowhat
 python-scrollphat python3-scrollphat
 python-scrollphathd python3-scrollphathd
-python-sn3218 python3-sn3218
 python-skywriter python3-skywriter
+python-sn3218 python3-sn3218
 python-touchphat python3-touchphat
-python-buttonshim python3-buttonshim
 python-unicornhathd  python3-unicornhathd
-python-pantilthat python3-pantilthat

stage5/00-install-extras/00-packages

@@ -1,16 +1,22 @@
-mu-editor
-sonic-pi
-scratch nuscratch scratch2 scratch3
-smartsim
-
-minecraft-pi python-minecraftpi python-picraft python3-picraft
-python-sense-emu sense-emu-tools python-sense-emu-doc
-
-wolfram-engine
+bluej
 claws-mail
-greenfoot-unbundled bluej
-nodered
-realvnc-vnc-viewer
-
-python-games
 code-the-classics
+greenfoot-unbundled
+minecraft-pi
+mu-editor
+nodered
+nuscratch
+python-games
+python-minecraftpi
+python-picraft
+python-sense-emu
+python-sense-emu-doc
+python3-picraft
+realvnc-vnc-viewer
+scratch
+scratch2
+scratch3
+sense-emu-tools
+smartsim
+sonic-pi
+wolfram-engine

stage5/00-install-libreoffice/00-packages

@@ -1,3 +1,3 @@
-libreoffice-pi
 libreoffice-help-en-gb
 libreoffice-l10n-en-gb
+libreoffice-pi