[debian-edu-commits] debian-edu/ 02/03: Merge remote-tracking branch 'origin/squid-related'

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit 50f3843b02937b8bddd9f7bda9c1c50f40de36e8
Merge: dcc40f4 ad9dfe0
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 19:49:24 2015 +0200

    Merge remote-tracking branch 'origin/squid-related'

 Makefile                                              |  1 +
 cf/cf.squid                                           |  2 ++
 debian/changelog                                      |  3 +++
 share/debian-edu-config/tools/migrate-squid-to-squid3 | 14 ++++++++++++++
 4 files changed, 20 insertions(+)

diff --cc debian/changelog
index e5f9b59,16abb94..1a79838
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,10 +1,21 @@@
 -debian-edu-config (1.818) UNRELEASED; urgency=medium
 +debian-edu-config (1.818) UNRELEASED; urgency=high
  
 +  [ Holger Levsen ]
 +  * testsuite/taskpkgs, kdm and network: drop tests for the Sugar profile as
 +    Sugar has been removed from Jessie, see #782504.
 +
 +  [ Wolfgang Schweer ]
 +  * Remove Debian-custom/099-mount-cdrom cause this script might
 +    possibly conflict with ltsp-client-builder.udeb postinst.
 +    (Closes: #780740).
 +  * Add Debian-custom/080-eatmydata to enable the usage of eatmydata
 +    as default for all possible LTSP installation methods. Partially
 +    addresses #781515.
+   * Add support for squid to squid3 migration:
+     - Add share/debian-edu-config/tools/migrate-squid-to-squid3.
+     - Adjust cf/cf.squid to run this script. (Closes: #779649).
  
 - -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 09 Apr 2015 15:13:53 +0200
 + -- Holger Levsen <holger at debian.org>  Tue, 14 Apr 2015 13:08:20 +0200
  
  debian-edu-config (1.817) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git