diff --git a/conf.d/education.mk b/conf.d/education.mk index b9bdbd35..8fd3fb83 100644 --- a/conf.d/education.mk +++ b/conf.d/education.mk @@ -78,7 +78,7 @@ endif @$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true) @$(call add,LIVE_PACKAGES,livecd-timezone) - @$(call add,LIVE_LISTS,slinux/network-base) + @$(call add,LIVE_LISTS,slinux/comm-base) @$(call add,LIVE_LISTS,$(call tags,base rescue)) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,STAGE2_PACKAGES,chrony) diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk index bb9befe6..4227831a 100644 --- a/conf.d/slinux.mk +++ b/conf.d/slinux.mk @@ -9,7 +9,7 @@ distro/slinux-live: distro/.livecd-install use/slinux/base distro/slinux: distro/.installer use/slinux/full use/rescue/base @$(call set,INSTALLER,simply-linux) - @$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/network-base) + @$(call add,MAIN_GROUPS,slinux/dropbox slinux/emulators-full slinux/games-base slinux/games slinux/games-full slinux/graphics-base slinux/graphics-full-blender slinux/graphics slinux/graphics-full-inkscape slinux/graphics-full-shotwell slinux/graphics-full-synfigstudio slinux/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/comm-base) @$(call set,META_VOL_SET,Simply Linux) @$(call set,META_VOL_ID,Simply Linux/$(ARCH)) diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 192be4b6..bd88ba6f 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -15,7 +15,7 @@ use/slinux/base: use/isohybrid use/slinux use/x11/xorg use/x11/lightdm/gtk +puls @$(call add,LIVE_LISTS,slinux/games-base) @$(call add,LIVE_LISTS,slinux/graphics-base) @$(call add,LIVE_LISTS,slinux/multimedia-base) - @$(call add,LIVE_LISTS,slinux/network-base) + @$(call add,LIVE_LISTS,slinux/comm-base) @$(call add,LIVE_LISTS,slinux/live) @$(call add,THE_LISTS,slinux/misc-base) @$(call add,THE_LISTS,slinux/xfce-base) diff --git a/pkg.in/groups/slinux/network-base.directory b/pkg.in/groups/slinux/comm-base.directory similarity index 66% rename from pkg.in/groups/slinux/network-base.directory rename to pkg.in/groups/slinux/comm-base.directory index 6b82171b..9e10b595 100644 --- a/pkg.in/groups/slinux/network-base.directory +++ b/pkg.in/groups/slinux/comm-base.directory @@ -2,8 +2,7 @@ Encoding=UTF-8 Type=Directory Name=Communications -X-Alterator-PackageList=slinux/network-base +X-Alterator-PackageList=slinux/comm-base X-Alterator-Required=yes Name[ru_RU]=Коммуникации -X-Alterator-Conflicts=network Categories=XFCE diff --git a/pkg.in/lists/slinux/network-base b/pkg.in/lists/slinux/comm-base similarity index 100% rename from pkg.in/lists/slinux/network-base rename to pkg.in/lists/slinux/comm-base