education: Use complete LibreOffice set with langpacks both for install and live

This commit is contained in:
Andrey Cherepanov 2021-04-30 18:54:51 +03:00 committed by Anton Midyukov
parent ddf1f8b09b
commit 0dcb8ed5c5

View File

@ -11,10 +11,7 @@ mixin/education: \
use/x11/lightdm/gtk +pulse \ use/x11/lightdm/gtk +pulse \
+nm use/x11/gtk/nm \ +nm use/x11/gtk/nm \
use/xdg-user-dirs/deep \ use/xdg-user-dirs/deep \
use/office/LibreOffice/still \ use/office/LibreOffice/full
use/office/LibreOffice/gtk3 \
use/office/LibreOffice/extensions \
use/office/LibreOffice/integrated
@$(call set,BRANDING,alt-education) @$(call set,BRANDING,alt-education)
@$(call add,THE_BRANDING,indexhtml) @$(call add,THE_BRANDING,indexhtml)
@$(call add,THE_BRANDING,menu xfce-settings system-settings) @$(call add,THE_BRANDING,menu xfce-settings system-settings)
@ -33,6 +30,7 @@ ifeq (distro,$(IMAGE_CLASS))
mixin/education-live: \ mixin/education-live: \
use/live/install use/live/suspend \ use/live/install use/live/suspend \
use/live/repo use/live/x11 use/live/rw \ use/live/repo use/live/x11 use/live/rw \
use/office/LibreOffice/full \
use/cleanup/live-no-cleanupdb use/cleanup/live-no-cleanupdb
@$(call add,LIVE_PACKAGES,livecd-timezone) @$(call add,LIVE_PACKAGES,livecd-timezone)
@$(call add,LIVE_PACKAGES,chromium) @$(call add,LIVE_PACKAGES,chromium)