Merge branch 'master' into 'master'

Also add the freeradius-krb5 package to tasks/bullseye/Debian-edu-full

See merge request images-team/debian-cd!10

debian/changelog

@@ -11,7 +11,8 @@ debian-cd (3.1.32) UNRELEASED; urgency=medium
   [ Wolfgang Schweer ]
   * data/bullseye: Update Debian Edu installer logo and syslinux splash image
     from src:debian-edu-artwork 2.11.2-1.
-  * tasks/bullseye/Debian-edu-full: Add winbind and freeradius packages.
+  * tasks/bullseye/Debian-edu-full: Add winbind, freeradius and freeradius-krb5
+    packages.
 
  -- Steve McIntyre <93sam@debian.org>  sat, 12 Dec 2020 03:12:36 +0100
 

tasks/bullseye/Debian-edu-full

@@ -18,13 +18,13 @@
  * recommended packages in task files) to be able to generate the BD image.
  * Please note: the libpam-krb5, dnsmasq and icinga2-ido-mysql packages had to
  * be added manually because they are installed via scripts during system setup
- * (as opposed to be installed automatically as Recommends). Also, the winbind
+ * (as opposed to be installed automatically as Recommends). Also, the winbind,
- * and freeradius packages have been added in case someone wants to install and
+ * freeradius and freeradius-krb5 packages have been added in case someone wants
- * configure the freeRADIUS server in offline mode (via a script shipped with
+ * to install and configure the freeRADIUS server in offline mode (via a script
- * the debian-edu-config package).
+ * shipped with the debian-edu-config package).
  * Sort of cleaned up from already included packages and amd64 specific ones.
  *
- * Generated: 2020-12-27
+ * Generated: 2021-01-12
  */
 accountsservice
 accountwizard
@@ -638,6 +638,7 @@ freebirth-data
 freeglut3
 freepats
 freeradius
+freeradius-krb5
 freerdp2-x11
 fritzing
 fritzing-data