diff --git a/conf.d/education.mk b/conf.d/education.mk index 660afa31..6af58fa5 100644 --- a/conf.d/education.mk +++ b/conf.d/education.mk @@ -30,9 +30,9 @@ distro/alt-education: distro/.installer \ @$(call add,THE_LISTS,gnome-p2p) @$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,MAIN_LISTS,slinux/not-install-full) - @$(call add,THE_LISTS,slinux/misc-full) @$(call add,BASE_LISTS,education/base) @$(call add,BASE_LISTS,workstation/3rdparty) + @$(call add,THE_LISTS,education/misc) @$(call add,MAIN_GROUPS,education/01_preschool) @$(call add,MAIN_GROUPS,education/02_gradeschool) @$(call add,MAIN_GROUPS,education/03_highschool) @@ -60,7 +60,7 @@ distro/alt-education: distro/.installer \ @$(call add,THE_LISTS,$(call tags,base regular)) @$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true) - @$(call add,LIVE_LISTS,education/live) + @$(call add,LIVE_PACKAGES,livecd-timezone) @$(call add,LIVE_LISTS,slinux/network-base) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,STAGE2_PACKAGES,chrony) diff --git a/pkg.in/lists/education/base b/pkg.in/lists/education/base index aa6ffd70..0eed7cac 100644 --- a/pkg.in/lists/education/base +++ b/pkg.in/lists/education/base @@ -21,8 +21,6 @@ gimp-plugin-gutenprint gimp-plugin-refocus-it java-1.8.0-openjdk-devel kdenlive -vlc-maxi -simplescreenrecorder scribus shotwell logisim @@ -131,7 +129,6 @@ mysql-connector-java # Firmware ^firmware-ipw[[:digit:]].* ^firmware-zd[[:digit:]].* -^libva-driver-[[:alpha:]]+$ ^xorg-extension-[[:alpha:]]+$ firmware-p54 @@ -145,15 +142,6 @@ alterator-postinstall alterator-sslkey alterator-updates -# Extra fonts -fonts-ttf-gost -fonts-ttf-xorg -fonts-ttf-PTAstra -fonts-ttf-XO -fonts-ttf-google-noto-sans -fonts-ttf-google-crosextra-caladea -fonts-ttf-google-crosextra-carlito - # WINE glibc-gconv-modules@i586 wine-programs@i586 @@ -197,11 +185,6 @@ zbar xfce4-whiskermenu-plugin xfce-polkit -# New utilites -disable-usb-autosuspend -color-prompt-and-man -shutter - # Virtualization support xorg-drv-vmware xorg-drv-vmmouse diff --git a/pkg.in/lists/education/live b/pkg.in/lists/education/live deleted file mode 100644 index a50b624e..00000000 --- a/pkg.in/lists/education/live +++ /dev/null @@ -1,15 +0,0 @@ -# Multimedia -vlc-maxi -simplescreenrecorder -libva-driver-intel -libva-driver-vdpau - -# Games -gnome-games-gnomine -gnome-games-gnotravex -gnome-games-gnotski -gnome-games-mahjongg -gnome-games-sol - -# Other -livecd-timezone diff --git a/pkg.in/lists/education/misc b/pkg.in/lists/education/misc new file mode 100644 index 00000000..bb67f5b3 --- /dev/null +++ b/pkg.in/lists/education/misc @@ -0,0 +1,58 @@ +# Multimedia +vlc-maxi +simplescreenrecorder +libva-driver-intel +libva-driver-vdpau + +# Graphics +ristretto +simple-scan +sane +hplip-sane + +# Games +gnome-games-gnomine +gnome-games-gnotravex +gnome-games-gnotski +gnome-games-mahjongg +gnome-games-sol + +# Dictionary +qstardict +dict-mueller7-utf8 + +# Fonts +fonts-ttf-gost +fonts-ttf-xorg +fonts-ttf-PTAstra +fonts-ttf-XO +fonts-ttf-google-noto-sans +fonts-ttf-google-crosextra-caladea +fonts-ttf-google-crosextra-carlito + +# Other +color-prompt-and-man +nvidia-xconfig +vlock +hplip-PPDs +hwinfo +ntfs-3g +perl-Crypt-Rijndael +dvgrab +mjpegtools +transcode +jackd +osec-mailreport +adjtimex +wodim +opensc +xorg-drv-wacom +ocfs2-tools +zsh +glxgears +rsync +screen +apcupsd +x11spice +shutter +disable-usb-autosuspend