cf3/cf.squid

@@ -24,13 +24,6 @@ files:
 
 commands:
 
-  # Remove /etc/default/squid. This is needed in case of upgrades from Stretch.
-
-  debian.squidcache.installation::
-
-    "/bin/rm -f /etc/default/squid"
-      contain => in_shell;
-
   # Update Squid to use all the available space (aka 80% of the partition)
 
   debian.squidcache.installation::

cf3/cf.workarounds

@@ -29,10 +29,3 @@ files:
 
 commands:
 
-  debian.xfce.(ltspclient|ltspserver).installation::
-  # Provide a screensaver as a workaround for #922718 (fixed in experimental
-  # but not in Buster). FIXME: Check if this is still needed for Bullseye.
-    "/usr/bin/apt-get install -y xscreensaver"
-      contain => in_shell;
-}
-

debian/changelog

@@ -10,6 +10,10 @@ debian-edu-config (2.11.4) UNRELEASED; urgency=medium
     references to EDUSUITE which were forgotten in a code cleanup in
     commit c6ef9d69 in 2016.
   * README: update reference to point to bullseye, not buster.
+  * cf3/cf.squid: drop workaround for stretch -> buster upgrades as skipping a
+    release when upgrading is not supported.
+  * cf.workarounds: drop workaround for #922718 as the fixed xfce4-session
+    package has made it into bullseye.
 
  -- Wolfgang Schweer <wschweer@arcor.de>  Tue, 08 Oct 2019 23:10:38 +1300