From 991af8f04363af923adc261e1b6003e2ee655b3f Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Thu, 21 Mar 2024 18:40:53 -0500
Subject: [PATCH] Enable pkgselect for everyone.

---
 {lubuntu => common}/modules/pkgselect_context.conf      | 0
 {lubuntu => common}/modules/pkgselect_snap_context.conf | 0
 debian/changelog                                        | 6 ++++++
 kubuntu/settings.conf                                   | 3 +++
 ubuntuunity/settings.conf                               | 3 +++
 5 files changed, 12 insertions(+)
 rename {lubuntu => common}/modules/pkgselect_context.conf (100%)
 rename {lubuntu => common}/modules/pkgselect_snap_context.conf (100%)

diff --git a/lubuntu/modules/pkgselect_context.conf b/common/modules/pkgselect_context.conf
similarity index 100%
rename from lubuntu/modules/pkgselect_context.conf
rename to common/modules/pkgselect_context.conf
diff --git a/lubuntu/modules/pkgselect_snap_context.conf b/common/modules/pkgselect_snap_context.conf
similarity index 100%
rename from lubuntu/modules/pkgselect_snap_context.conf
rename to common/modules/pkgselect_snap_context.conf
diff --git a/debian/changelog b/debian/changelog
index 27b615a..6d39dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (1:24.04.21) UNRELEASED; urgency=medium
+
+  * Enable pkgselect for everyone.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 21 Mar 2024 18:40:34 -0500
+
 calamares-settings-ubuntu (1:24.04.20) noble; urgency=medium
 
   * Fix LUKS passphrase unlocker for non-US keyboard layouts.
diff --git a/kubuntu/settings.conf b/kubuntu/settings.conf
index 6058535..48b8d3c 100644
--- a/kubuntu/settings.conf
+++ b/kubuntu/settings.conf
@@ -35,6 +35,7 @@ sequence:
   - welcome
   - locale
   - keyboard
+  - pkgselect
   - partition
   - users
   - summary
@@ -64,6 +65,8 @@ sequence:
   - shellprocess@add386arch
   - shellprocess@fixconkeys_part1
   - shellprocess@fixconkeys_part2
+  - contextualprocess@pkgselect_action
+  - contextualprocess@pkgselect_snap_action
   - packages
   - shellprocess@logs
   - umount
diff --git a/ubuntuunity/settings.conf b/ubuntuunity/settings.conf
index 5b63c2a..1adbe1f 100644
--- a/ubuntuunity/settings.conf
+++ b/ubuntuunity/settings.conf
@@ -35,6 +35,7 @@ sequence:
   - welcome
   - locale
   - keyboard
+  - pkgselect
   - partition
   - users
   - summary
@@ -64,6 +65,8 @@ sequence:
   - shellprocess@add386arch
   - shellprocess@fixconkeys_part1
   - shellprocess@fixconkeys_part2
+  - contextualprocess@pkgselect_action
+  - contextualprocess@pkgselect_snap_action
   - packages
   - shellprocess@logs
   - umount