[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Drop etc/apt/apt.conf.d/90squid

[WolfgangSchweer]

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


Commits:
14d0147b by Wolfgang Schweer at 2018-09-20T09:21:04Z
Drop etc/apt/apt.conf.d/90squid

The workaround is obsolete, the related bug has been fixed in 2015.
Adjust d/debian-edu-config.maintscript and Makefile.

- - - - -


4 changed files:

- Makefile
- debian/changelog
- debian/debian-edu-config.maintscript
- − etc/apt/apt.conf.d/90squid


Changes:

=====================================
Makefile
=====================================
@@ -65,7 +65,6 @@ CF3FILES = \
 
 # Files to install in /etc/
 SYSCONFFILES = \
-	apt/apt.conf.d/90squid \
 	apt/apt.conf.d/99-edu-prefer-firefox \
 	bind/named.conf.ldap2zone \
 	bind/db.intern \


=====================================
debian/changelog
=====================================
@@ -8,6 +8,9 @@ debian-edu-config (2.10.37) UNRELEASED; urgency=medium
       /etc/default/squid, adjust the code to be systemd compliant.
   * www/index.html.*: Use relative links whenever possible. (Closes: #906467).
   * cf3/cf.desktop-networked: Replace 'apt' with 'apt-get' in shell command.
+  * Drop etc/apt/apt.conf.d/90squid:
+    - The workaround is obsolete, the related bug has been fixed in 2015.
+    - Adjust d/debian-edu-config.maintscript and Makefile.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 19 Sep 2018 10:17:02 +0200
 


=====================================
debian/debian-edu-config.maintscript
=====================================
@@ -16,3 +16,4 @@ rm_conffile /etc/ldap/slapd-lenny_debian-edu.conf 1.911
 rm_conffile /etc/cfengine3/debian-edu/cf.pki 2.10.19
 rm_conffile /etc/cfengine3/debian-edu/cf.thunderbird 2.10.19
 rm_conffile /etc/desktop-profiles/debian-edu-config.listing 2.10.22
+rm_conffile /etc/apt/apt.conf.d/90squid 2.10.36


=====================================
etc/apt/apt.conf.d/90squid deleted
=====================================
@@ -1,3 +0,0 @@
-// Avoid Squid handing out corrupt packages, solves Skolelinux bug
-// #1419.
-Acquire::http::Pipeline-Depth 0;



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/14d0147b9bc36852f142225433cfa18d0c313d3e

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/14d0147b9bc36852f142225433cfa18d0c313d3e
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/20180920/3222cd18/attachment-0001.html>