[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: cf3/cf.squid: drop workaround for stretch -> buster upgrades.

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-config


Commits:
a5a0fbbf by Holger Levsen at 2019-10-08T11:03:50Z
cf3/cf.squid: drop workaround for stretch -> buster upgrades.

Skipping a release when upgrading is not supported.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
6c9a9252 by Holger Levsen at 2019-10-08T11:11:56Z
cf.workarounds: drop workaround for #922718.

The fixed xfce4-session package has made it into bullseye:
https://sources.debian.org/src/xfce4-session/4.14.0-1/debian/patches/0001-Update-locker-list-in-xflock4.patch/

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- cf3/cf.squid
- cf3/cf.workarounds
- debian/changelog


Changes:

=====================================
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 at arcor.de>  Tue, 08 Oct 2019 23:10:38 +1300
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/51fc114419dfe5568b5390aaffcc8fcc7d46a320...6c9a9252f646ddb964e60eb08e3b220e8cc4537d

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/51fc114419dfe5568b5390aaffcc8fcc7d46a320...6c9a9252f646ddb964e60eb08e3b220e8cc4537d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20191008/4ee6f855/attachment-0001.html>