slinux, education.mk: Rename network-base -> comm-base

This list for Communications, not network in general.
This commit is contained in:
Mikhail Efremov 2019-04-15 20:36:21 +03:00 committed by Anton Midyukov
parent 9d3d416794
commit eeea63f92f
5 changed files with 4 additions and 5 deletions

View File

@ -78,7 +78,7 @@ endif
@$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true) @$(call set,GLOBAL_LIVE_NO_CLEANUPDB,true)
@$(call add,LIVE_PACKAGES,livecd-timezone) @$(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,LIVE_LISTS,$(call tags,base rescue))
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad) @$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
@$(call add,STAGE2_PACKAGES,chrony) @$(call add,STAGE2_PACKAGES,chrony)

View File

@ -9,7 +9,7 @@ distro/slinux-live: distro/.livecd-install use/slinux/base
distro/slinux: distro/.installer use/slinux/full use/rescue/base distro/slinux: distro/.installer use/slinux/full use/rescue/base
@$(call set,INSTALLER,simply-linux) @$(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_SET,Simply Linux)
@$(call set,META_VOL_ID,Simply Linux/$(ARCH)) @$(call set,META_VOL_ID,Simply Linux/$(ARCH))

View File

@ -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/games-base)
@$(call add,LIVE_LISTS,slinux/graphics-base) @$(call add,LIVE_LISTS,slinux/graphics-base)
@$(call add,LIVE_LISTS,slinux/multimedia-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,LIVE_LISTS,slinux/live)
@$(call add,THE_LISTS,slinux/misc-base) @$(call add,THE_LISTS,slinux/misc-base)
@$(call add,THE_LISTS,slinux/xfce-base) @$(call add,THE_LISTS,slinux/xfce-base)

View File

@ -2,8 +2,7 @@
Encoding=UTF-8 Encoding=UTF-8
Type=Directory Type=Directory
Name=Communications Name=Communications
X-Alterator-PackageList=slinux/network-base X-Alterator-PackageList=slinux/comm-base
X-Alterator-Required=yes X-Alterator-Required=yes
Name[ru_RU]=Коммуникации Name[ru_RU]=Коммуникации
X-Alterator-Conflicts=network
Categories=XFCE Categories=XFCE