Commit e92679b7 authored by Andrey Cherepanov's avatar Andrey Cherepanov Committed by Michael Shigorin

education.mk, kde5, server-apps-edu: improve contents

- Use firefox-esr instead of firefox - Use mariadb insead of MySQL - Add memtest check to disk menu - Use kde5 without kde5-kdepim - Use Moodle 2.5 instead of 2.2
parent aabf9323
# Education Set # ALT Education
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
distro/education: distro/.installer use/slinux/full \ distro/education: distro/.installer use/slinux/full \
use/browser/firefox/esr \
use/memtest \
use/l10n/default/ru_RU +vmguest use/l10n/default/ru_RU +vmguest
@$(call set,INSTALLER,junior) @$(call set,INSTALLER,junior)
@$(call set,BRANDING,alt-education) @$(call set,BRANDING,alt-education)
......
kde5-big kde5
kf5-plasma-workspace
kde5-krfb
kde5-edu
kde5-printing
kde5-scanning
kde5-connect
kf5-i18n-ru kf5-i18n-ru
kde5-i18n-ru kde5-i18n-ru
...@@ -7,8 +7,8 @@ sp ...@@ -7,8 +7,8 @@ sp
clamav clamav
clamav-db clamav-db
MySQL-server mariadb-server
MySQL-client mariadb-client
#@I586_ONLY@haspd #@I586_ONLY@haspd
#@X86_64_ONLY@i586-haspd #@X86_64_ONLY@i586-haspd
...@@ -41,29 +41,29 @@ alterator-console ...@@ -41,29 +41,29 @@ alterator-console
alterator-postinstall alterator-postinstall
# ===== Services ===== # ===== Services =====
MySQL-server mariadb-server
libmysqlclient18 libmysqlclient18
rujel rujel
installed-db-office-server-rujel installed-db-office-server-rujel
MySQL-server mariadb-server
libmysqlclient18 libmysqlclient18
mediawiki-mysql mediawiki-mysql
mediawiki mediawiki
mediawiki-ldap mediawiki-ldap
installed-db-office-server-mediawiki installed-db-office-server-mediawiki
MySQL-server mariadb-server
libmysqlclient18 libmysqlclient18
owncloud owncloud
owncloud-apache2 owncloud-apache2
installed-db-office-server-owncloud installed-db-office-server-owncloud
MySQL-server mariadb-server
libmysqlclient18 libmysqlclient18
moodle2.2 moodle2.5
moodle2.2-apache2 moodle2.5-apache2
moodle2.2-local-mysql moodle2.5-local-mysql
moodle2.2-lang-ru moodle2.5-lang-ru
moodle-install-tools moodle-install-tools
alterator-moodle-install alterator-moodle-install
installed-db-office-server-moodle installed-db-office-server-moodle
......
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