From 70bfc2d0647c6bc84c624b43d9288e98fa034613 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Tue, 3 Dec 2019 20:27:01 +0300 Subject: [PATCH] slinux, education.mk: Rename group Communications -> Internet/Networking As more appropriate name for this group. Also rename comm-base -> net-base. --- conf.d/education.mk | 2 +- conf.d/slinux.mk | 2 +- features.in/slinux/config.mk | 4 ++-- pkg.in/groups/slinux/comm-base.directory | 8 -------- pkg.in/groups/slinux/net-base.directory | 10 ++++++++++ pkg.in/lists/slinux/{comm-base => net-base} | 0 6 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 pkg.in/groups/slinux/comm-base.directory create mode 100644 pkg.in/groups/slinux/net-base.directory rename pkg.in/lists/slinux/{comm-base => net-base} (100%) diff --git a/conf.d/education.mk b/conf.d/education.mk index 8fd3fb83..feb79101 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/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) diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk index 2a9bfa69..91ed9c06 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/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 diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 225c58f3..9ba4da57 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -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)) diff --git a/pkg.in/groups/slinux/comm-base.directory b/pkg.in/groups/slinux/comm-base.directory deleted file mode 100644 index 9e10b595..00000000 --- a/pkg.in/groups/slinux/comm-base.directory +++ /dev/null @@ -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 diff --git a/pkg.in/groups/slinux/net-base.directory b/pkg.in/groups/slinux/net-base.directory new file mode 100644 index 00000000..ce424813 --- /dev/null +++ b/pkg.in/groups/slinux/net-base.directory @@ -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 diff --git a/pkg.in/lists/slinux/comm-base b/pkg.in/lists/slinux/net-base similarity index 100% rename from pkg.in/lists/slinux/comm-base rename to pkg.in/lists/slinux/net-base