education.mk, education/desktop: add projectlibre to disk

...add thunderbird too; move firefox-esr to pkglist.

conf.d/education.mk

@@ -27,13 +27,13 @@ distro/alt-education: distro/.installer use/slinux/full \
 	@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse disable-usb-autosuspend)
 	@$(call add,THE_PACKAGES,bluez pulseaudio-bluez)
 	@$(call add,THE_PACKAGES,os-prober)
-	@$(call add,THE_PACKAGES,firefox-esr firefox-esr-ru)
 	@$(call add,THE_PACKAGES,guest-account)
 	@$(call add,THE_PACKAGES,nextcloud-client)
 	@$(call add,THE_PACKAGES,alterator-fbi)
 	@$(call add,THE_PACKAGES,net-tools fdisk gdisk parted partclone)
 	@$(call add,MAIN_PACKAGES,iperf3 owamp-server)
 	@$(call add,MAIN_PACKAGES,rujel stellarium)
+	@$(call add,MAIN_PACKAGES,projectlibre)
 	@$(call add,THE_LISTS,$(call tags,base regular))
 	@$(call add,SERVICES_ENABLE,bluetoothd sshd bind crond alteratord cups ahttpd)
 	@$(call add,STAGE1_MODLISTS,stage2-mmc)

pkg.in/lists/education/desktop

@@ -90,6 +90,12 @@ xfce-polkit
 # New utilites
 disable-usb-autosuspend
 color-prompt-and-man
+shutter
 # Virtualization support
 xorg-drv-vmware
 xorg-drv-vmmouse
+# Mozilla
+firefox-esr
+firefox-esr-ru
+thunderbird
+thunderbird-ru