From 221d70228458c9202590957344907c92674d53c6 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Sun, 16 May 2021 15:37:38 +0100
Subject: [PATCH] Add brltty and espeakup to all images from netinst up

---
 debian/changelog         | 8 ++++++++
 tasks/bullseye/forcd1    | 6 +-----
 tools/generate_di+k_list | 6 ++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cc4df13..b2b87001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-cd (3.1.35) UNRELEASED; urgency=medium
+
+  [ Steve McIntyre ]
+  * Add brltty and espeakup to all images from netinst up, for blind
+    users.
+
+ -- Steve McIntyre <93sam@debian.org>  Sun, 16 May 2021 15:36:53 +0100
+
 debian-cd (3.1.34) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/tasks/bullseye/forcd1 b/tasks/bullseye/forcd1
index 904ee658..8f465da3 100644
--- a/tasks/bullseye/forcd1
+++ b/tasks/bullseye/forcd1
@@ -6,11 +6,7 @@
 openssh-client
 /* could be used by debconf in certain configurations */
 libterm-readline-gnu-perl
-/* Accessibility stuff that is installed by base-installer
- * in certain situations, but too large for the netinst. */
-brltty
-espeakup
-alsa-utils
+
 /* See rationale in #630805 */
 apt-offline
 
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index df8529c3..eb0dfb37 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -93,6 +93,12 @@ locales
 /* Needed for some languages with bi-directional support */
 libfribidi0
 
+/* Accessibility stuff that is installed by base-installer
+ * in certain situations. */
+alsa-utils
+brltty
+espeakup
+
 /* Needed for rootless installs. */
 sudo