[debian-edu-commits] debian-edu/ 01/03: Merge branch 'ltsp-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 dcc40f4c42ecdc3095de27a08aedd2a0117b7e95
Merge: 10c4fb5 af3dc6e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 19:36:38 2015 +0200

    Merge branch 'ltsp-related'

 Makefile                                           |  2 +-
 debian/changelog                                   |  9 +++++++
 .../ltsp-build-client/Debian-custom/080-eatmydata  | 22 +++++++++++++++++
 .../Debian-custom/099-mount-cdrom                  | 28 ----------------------
 4 files changed, 32 insertions(+), 29 deletions(-)

diff --cc debian/changelog
index a73bbf3,ce75f02..e5f9b59
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,18 @@@
 -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.
+ 
 - -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 18 Mar 2015 18:26:30 +0100
 + -- 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