add Education Junior (target education-junior)

Based on ALT Linux School 7.0.5 Junior and Simply Linux target:
- simplify rules
- use list with educational software missing in Simply Linux
- fix Simply Linux build on Sisyphus

conf.d/education.mk

@@ -0,0 +1,10 @@
+# Education Set
+
+ifeq (distro,$(IMAGE_CLASS))
+
+distro/education-junior: distro/.installer use/slinux/full
+	@$(call set,BRANDING,school-junior)
+	@$(call set,META_VOL_SET,Education Junior)
+	@$(call add,THE_LISTS,education/desktop)
+
+endif

pkg.in/lists/education/desktop

@@ -0,0 +1,118 @@
+#i586-citrix-client
+LibreOffice-extensions
+LibreOffice-integrated
+LibreOffice-gnome
+^firmware-ipw[[:digit:]].*
+^firmware-zd[[:digit:]].*
+^libva-driver-[[:alpha:]]+$
+^xorg-extension-[[:alpha:]]+$
+alterator-net-general
+alterator-net-wifi
+alterator-postinstall
+altlinux-freedesktop-menu-kde4
+apt-rsync
+audacity
+avplay
+basic256
+blender
+bluefish
+bumblebee
+cabextract
+cheese
+clamav
+clamav-db
+clamtk
+codeblocks
+codeblocks-contrib
+debhelper
+dia
+dict-mueller7-utf8
+dosbox
+fbreader
+firmware-p54
+fonts-ttf-gost
+fonts-ttf-xorg
+fonts-ttf-znamen
+fpc
+fpc-ide
+freebasic
+gambas3-full
+gcc
+gcompris
+gcompris-voices-ru
+geany
+geany-plugins
+gimp-help-ru
+gimp-plugin-gutenprint
+gimp-plugin-refocus-it
+gnome-disk-utility
+goldendict
+gst-plugins-bad
+gst-plugins-ugly
+htop
+i586-glibc-gconv-modules
+i586-libwine-vanilla-gl
+i586-libwine-vanilla-twain
+i586-wine-vanilla
+inkscape
+installer-distro-junior-stage3
+installer-feature-auto-domain
+installer-feature-online-repo
+installer-feature-repo-add
+installer-feature-resolver-bind-stage3
+installer-feature-symlinks-from-sbin
+italc2-client
+itest
+java-1.7.0-openjdk-devel
+kde-common
+kde4-i18n-ru
+kde4base-runtime
+kde4base-runtime-core
+kde4libs
+kdenlive
+kernel-modules-bbswitch-std-def
+keyutils
+krb5-kinit
+kumir
+lazarus
+libnss-fallback
+libsqlite
+lm_sensors3-utils
+logisim
+mc-full
+media-player-info
+mysql-connector-java
+nano
+netpolice-filter
+netpolice-main
+octave
+pentaho-reporting-flow-engine
+perl-DBD-mysql
+postgresql-jdbc
+puppet
+quick-usb-formatter
+rpm-build
+sane
+sane-frontends
+scratch
+scribus
+setbranding
+shotwell
+smplayer
+system-report
+tesseract
+tesseract-langpack-ru
+udev-rule-generator-cdrom
+umki
+virtualbox-guest-utils
+wine-gecko
+wine-mono
+wxMaxima
+xorg-dri-intel
+xorg-drv-openchrome
+xorg-drv-radeon
+xsane
+xsane-gimp2
+xscreensaver-hacks-rss_glx
+yagf
+zbar

pkg.in/lists/slinux/misc

@@ -94,9 +94,9 @@ plymouth
 
 # Office
 java-1.6.0-sun
-libreoffice
+LibreOffice-integrated
-libreoffice-gnome
+LibreOffice-gnome
-libreoffice-langpack-ru
+LibreOffice-langpack-ru
 evince
 stardict-gtk
 stardict-mueller7

pkg.in/lists/slinux/misc-dvd

@@ -1,7 +1,7 @@
 #mintmenu
 homebank
 aspell-uk
-libreoffice-langpack-ru
+LibreOffice-langpack-ru
 stardict-slovnyk_ru-en
 stardict-slovnyk_en-uk
 stardict-slovnyk_uk-en

pkg.in/lists/slinux/x86_64

@@ -1,6 +1,5 @@
 i586-glibc-core
 i586-libalsa
-i586-libssl7
 i586-libXv
 i586-libXScrnSaver
 i586-libdbus

pkg.in/lists/slinux/xfce

@@ -19,6 +19,7 @@ xfce4-default
 gvfs
 gvfs-backends
 udisks2
+ntfs-3g
 
 #xfce-additional
 #xfprint
@@ -38,9 +39,9 @@ xscreensaver-modules-gl-
 #samba
 thunar-shares-plugin
 
-xfce4-wmdock-plugin-
+#xfce4-wmdock-plugin-
-xfce4-radio-plugin-
+#xfce4-radio-plugin-
-xfce4-genmon-plugin-
+#xfce4-genmon-plugin-
 
 xfwm4-themes
 #xfce4-dict