From e92679b75f64af0de3afbbbf05952325ce0d7957 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Fri, 22 Jul 2016 00:11:05 +0300 Subject: [PATCH] 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 --- conf.d/education.mk | 4 +++- pkg.in/lists/kde5 | 10 +++++++++- pkg.in/lists/server-apps-edu | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/conf.d/education.mk b/conf.d/education.mk index 66d0d358..c23fe1e0 100644 --- a/conf.d/education.mk +++ b/conf.d/education.mk @@ -1,8 +1,10 @@ -# Education Set +# ALT Education ifeq (distro,$(IMAGE_CLASS)) distro/education: distro/.installer use/slinux/full \ + use/browser/firefox/esr \ + use/memtest \ use/l10n/default/ru_RU +vmguest @$(call set,INSTALLER,junior) @$(call set,BRANDING,alt-education) diff --git a/pkg.in/lists/kde5 b/pkg.in/lists/kde5 index 03d5f7e5..1b5501f3 100644 --- a/pkg.in/lists/kde5 +++ b/pkg.in/lists/kde5 @@ -1,3 +1,11 @@ -kde5-big +kde5 +kf5-plasma-workspace + +kde5-krfb +kde5-edu +kde5-printing +kde5-scanning +kde5-connect + kf5-i18n-ru kde5-i18n-ru diff --git a/pkg.in/lists/server-apps-edu b/pkg.in/lists/server-apps-edu index 1765fc20..d1605a7c 100644 --- a/pkg.in/lists/server-apps-edu +++ b/pkg.in/lists/server-apps-edu @@ -7,8 +7,8 @@ sp clamav clamav-db -MySQL-server -MySQL-client +mariadb-server +mariadb-client #@I586_ONLY@haspd #@X86_64_ONLY@i586-haspd @@ -41,29 +41,29 @@ alterator-console alterator-postinstall # ===== Services ===== -MySQL-server +mariadb-server libmysqlclient18 rujel installed-db-office-server-rujel -MySQL-server +mariadb-server libmysqlclient18 mediawiki-mysql mediawiki mediawiki-ldap installed-db-office-server-mediawiki -MySQL-server +mariadb-server libmysqlclient18 owncloud owncloud-apache2 installed-db-office-server-owncloud -MySQL-server +mariadb-server libmysqlclient18 -moodle2.2 -moodle2.2-apache2 -moodle2.2-local-mysql -moodle2.2-lang-ru +moodle2.5 +moodle2.5-apache2 +moodle2.5-local-mysql +moodle2.5-lang-ru moodle-install-tools alterator-moodle-install installed-db-office-server-moodle