slinux, education.mk: Rename group Communications -> Internet/Networking
As more appropriate name for this group. Also rename comm-base -> net-base.
This commit is contained in:
parent
bad41108d4
commit
70bfc2d064
@ -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/comm-base)
|
||||
@$(call add,LIVE_LISTS,slinux/net-base)
|
||||
@$(call add,LIVE_LISTS,$(call tags,base rescue))
|
||||
@$(call add,STAGE2_PACKAGES,xorg-conf-libinput-touchpad)
|
||||
@$(call add,STAGE2_PACKAGES,chrony)
|
||||
|
@ -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/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 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/multimedia-full-audacity slinux/multimedia-base slinux/multimedia-full-cheese slinux/multimedia slinux/multimedia-full-pitivi slinux/multimedia-full-sound-juicer slinux/net-base)
|
||||
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
|
||||
@$(call add,MAIN_GROUPS, slinux/graphics-full-synfigstudio)
|
||||
endif
|
||||
|
@ -10,7 +10,7 @@ use/slinux/vm-base: vm/systemd use/x11/armsoc \
|
||||
@$(call add,THE_LISTS,slinux/games-base)
|
||||
@$(call add,THE_LISTS,slinux/graphics-base)
|
||||
@$(call add,THE_LISTS,slinux/multimedia-base)
|
||||
@$(call add,THE_LISTS,slinux/comm-base)
|
||||
@$(call add,THE_LISTS,slinux/net-base)
|
||||
|
||||
use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
|
||||
+nm use/x11/gtk/nm +systemd +systemd-optimal +wireless use/l10n/default/ru_RU \
|
||||
@ -19,7 +19,7 @@ use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \
|
||||
@$(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/comm-base)
|
||||
@$(call add,LIVE_LISTS,slinux/net-base)
|
||||
@$(call add,THE_LISTS,slinux/misc-base)
|
||||
@$(call add,THE_LISTS,slinux/xfce-base)
|
||||
@$(call add,THE_LISTS,$(call tags,base l10n))
|
||||
|
@ -1,8 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Communications
|
||||
X-Alterator-PackageList=slinux/comm-base
|
||||
X-Alterator-Required=yes
|
||||
Name[ru_RU]=Коммуникации
|
||||
Categories=XFCE
|
10
pkg.in/groups/slinux/net-base.directory
Normal file
10
pkg.in/groups/slinux/net-base.directory
Normal file
@ -0,0 +1,10 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Type=Directory
|
||||
Name=Internet/Networking
|
||||
Name[ru_RU]=Интернет/сети
|
||||
Comment=Networking applications
|
||||
Comment[ru_RU]=Сетевые приложения
|
||||
X-Alterator-PackageList=slinux/net-base
|
||||
X-Alterator-Required=yes
|
||||
Categories=XFCE
|
Loading…
Reference in New Issue
Block a user