From 0a95d860f513f9e975cef6eab55003489b608b18 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Fri, 10 Jul 2020 14:16:45 -0400
Subject: [PATCH] tasksel: improved metapackage selection for xorg

---
 helpers/DATA/tasksel/ltsp-server      | 1 +
 helpers/DATA/tasksel/triskel          | 3 +++
 helpers/DATA/tasksel/trisquel-desktop | 3 +++
 helpers/DATA/tasksel/trisquel-mini    | 3 +++
 helpers/make-tasksel                  | 4 ++--
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/helpers/DATA/tasksel/ltsp-server b/helpers/DATA/tasksel/ltsp-server
index f9abdb3..c409aa2 100644
--- a/helpers/DATA/tasksel/ltsp-server
+++ b/helpers/DATA/tasksel/ltsp-server
@@ -5,4 +5,5 @@ Description: LTSP server
 Packages: list
 Key:
  trisquel-base
+ trisquel-base-recommended
  ltsp-server-standalone
diff --git a/helpers/DATA/tasksel/triskel b/helpers/DATA/tasksel/triskel
index 6586cc9..6158e90 100644
--- a/helpers/DATA/tasksel/triskel
+++ b/helpers/DATA/tasksel/triskel
@@ -6,3 +6,6 @@ Packages: list
 Key:
  triskel
  triskel-recommended
+ trisquel-base
+ trisquel-base-recommended
+ trisquel-desktop-common-recommended
diff --git a/helpers/DATA/tasksel/trisquel-desktop b/helpers/DATA/tasksel/trisquel-desktop
index 2bb48a2..99e3584 100644
--- a/helpers/DATA/tasksel/trisquel-desktop
+++ b/helpers/DATA/tasksel/trisquel-desktop
@@ -6,3 +6,6 @@ Packages: list
 Key:
  trisquel
  trisquel-recommended
+ trisquel-base
+ trisquel-base-recommended
+ trisquel-desktop-common-recommended
diff --git a/helpers/DATA/tasksel/trisquel-mini b/helpers/DATA/tasksel/trisquel-mini
index c38d866..22e272a 100644
--- a/helpers/DATA/tasksel/trisquel-mini
+++ b/helpers/DATA/tasksel/trisquel-mini
@@ -6,3 +6,6 @@ Packages: list
 Key:
  trisquel-mini
  trisquel-mini-recommended
+ trisquel-base
+ trisquel-base-recommended
+ trisquel-desktop-common-recommended
diff --git a/helpers/make-tasksel b/helpers/make-tasksel
index fdb5344..9700b91 100644
--- a/helpers/make-tasksel
+++ b/helpers/make-tasksel
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2008-2016  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 COMPONENT=main
 
 . ./config