From 290edcf5a17319784447f2b7cd9af478d1e821ae Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin.whitaker.me.uk>
Date: Sat, 22 Oct 2022 17:46:55 +0100
Subject: Add missing categories in group-include.lst.

The new selection algorithm in drakiso 1.19 implicitly includes
categories that aren't listed, so we now need to set a threshold
for all categories where we don't a threshold of 1.

Also drop task-plasma5 and task-gnome, which don't really add
anything (they recommend, not require).
---
 config/group-include.lst    | 13 ++++++++++---
 config/pkg-include-core.lst |  1 -
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'config')

diff --git a/config/group-include.lst b/config/group-include.lst
index 8e472b0..ac7ad3d 100644
--- a/config/group-include.lst
+++ b/config/group-include.lst
@@ -3,14 +3,17 @@
 
 # Basic system
 INSTALL 1
+LIVE 6
 CAT_SYSTEM 1
 CAT_X 1
 
 # DEs
 CAT_GRAPHICAL_DESKTOP 4
 CAT_CINNAMON 1
+CAT_ENLIGHTENMENT 6
 CAT_GNOME 1
 CAT_LXDE 1
+CAT_LXQT 6
 CAT_MATE 1
 CAT_PLASMA5 1
 CAT_XFCE 1
@@ -25,6 +28,7 @@ CAT_CONFIG 1
 CAT_EDITORS 4
 CAT_EDUCATION 3
 CAT_EMULATORS 4
+CAT_GAMES 6
 CAT_GRAPHICS 1
 CAT_DATABASES 4
 CAT_DEVELOPMENT 2
@@ -45,13 +49,17 @@ CAT_NETWORKING_IRC 3
 CAT_NETWORKING_LDAP_SERVER 3
 CAT_NETWORKING_MAIL 4
 CAT_NETWORKING_MAIL_SERVER 5
+CAT_NETWORKING_NEWS 5
+CAT_NETWORKING_NEWS_SERVER 6
 CAT_NETWORKING_OTHER 3
 CAT_NETWORKING_OTHER_SERVER 3
 CAT_NETWORKING_REMOTE_ACCESS 3
 CAT_NETWORKING_REMOTE_ACCESS_SERVER 3
 CAT_NETWORKING_WWW 4
 CAT_NETWORKING_WWW_SERVER 5
-CAT_OFFICE 5
+CAT_NIS 5
+CAT_NIS_SERVER 6
+CAT_OFFICE 4
 CAT_PRINTER 1
 CAT_PUBLISHING 4
 CAT_SCIENCES 3
@@ -62,12 +70,11 @@ CAT_TEXT_TOOLS 3
 CAT_TV 3
 CAT_VIDEO 3
 CAT_VIDEO_EDITING 3
+CAT_WEBMIN 6
 CAT_WIZARDS 3
 PHOTO 3
 SCANNER 4
 
 # Meta-tasks
-task-gnome
-task-plasma5
 task-printing-scanning
 task-obsolete
diff --git a/config/pkg-include-core.lst b/config/pkg-include-core.lst
index 522a7e7..522b6c1 100644
--- a/config/pkg-include-core.lst
+++ b/config/pkg-include-core.lst
@@ -68,7 +68,6 @@ system-config-printer
 taskwarrior
 vnstat
 vpnc
-xawtv
 
 i586:   libSDL_net1.2_0
 i586:   wine
-- 
cgit v1.2.1