Commit 17a96b02 authored by Andrey Cherepanov's avatar Andrey Cherepanov Committed by Anton Midyukov

education: add robotics group and move libreoffice to group

parent a616b461
......@@ -12,7 +12,6 @@ mixin/education: \
use/x11/lightdm/gtk +pulse \
+nm use/x11/gtk/nm \
use/xdg-user-dirs/deep \
use/office/LibreOffice/full \
use/browser/chromium
@$(call set,BRANDING,alt-education)
@$(call add,THE_BRANDING,indexhtml)
......@@ -143,6 +142,7 @@ mixin/education-installer: \
@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,MAIN_GROUPS,education/00_base)
@$(call add,MAIN_GROUPS,education/00_libreoffice)
@$(call add,MAIN_GROUPS,education/01_preschool)
@$(call add,MAIN_GROUPS,education/02_gradeschool)
@$(call add,MAIN_GROUPS,education/03_highschool)
......@@ -150,6 +150,7 @@ mixin/education-installer: \
@$(call add,MAIN_GROUPS,education/05_university)
@$(call add,MAIN_GROUPS,education/07_teacher)
@$(call add,MAIN_GROUPS,education/08_server-apps-edu)
@$(call add,MAIN_GROUPS,education/10_robotics)
@$(call add,BASE_PACKAGES,os-prober)
@$(call add,BASE_PACKAGES,guest-account)
@$(call add,MAIN_PACKAGES,iperf3)
......
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=LibreOffice Office Suite
X-Alterator-PackageList=education/libreoffice
Name[ru_RU]=Офисный пакет LibreOffice
X-Alterator-Required=yes
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=Robotics
X-Alterator-PackageList=education/robotics
X-Alterator-Required=no
Name[ru_RU]=Робототехника
......@@ -33,6 +33,5 @@ kde5-edu
kde5-printing
kde5-scanning
kde5-connect
LibreOffice-still-kde5@!E2K
nextcloud-client-kde5@!E2K
branding-alt-education-kde-settings
LibreOffice-still@META
LibreOffice-still-gtk3
LibreOffice-still-langpack-be
LibreOffice-still-langpack-kk
LibreOffice-still-langpack-ru
LibreOffice-still-langpack-uk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment