From 2547ec858e6e0c10ca0efff4e02a06d2788133c1 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Mon, 24 Oct 2016 15:53:19 +0300 Subject: [PATCH] education.mk, education/base: revert to chromium from chromium-stable ...and add kumir2, rujel and task-samba-dc to disk --- conf.d/education.mk | 2 ++ pkg.in/lists/education/base | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf.d/education.mk b/conf.d/education.mk index e836e38a..3f471d83 100644 --- a/conf.d/education.mk +++ b/conf.d/education.mk @@ -24,6 +24,8 @@ distro/education: distro/.installer use/slinux/full \ @$(call add,THE_PACKAGES,firefox-esr firefox-esr-ru) @$(call add,THE_PACKAGES,guest-account) @$(call add,MAIN_PACKAGES,iperf3 owamp-server) + @$(call add,MAIN_PACKAGES,task-samba-dc) + @$(call add,MAIN_PACKAGES,kumir2 rujel) @$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-stage2) @$(call add,THE_LISTS,education/desktop) @$(call add,SERVICES_ENABLE,bluetoothd sshd syslogd) diff --git a/pkg.in/lists/education/base b/pkg.in/lists/education/base index 537609f8..c0365d79 100644 --- a/pkg.in/lists/education/base +++ b/pkg.in/lists/education/base @@ -71,6 +71,6 @@ installer-feature-xdg-user-dirs gparted rosa-imagewriter -chromium-stable -chromium-stable-gnome +chromium +chromium-gnome ppapi-plugin-adobe-flash