[debian-edu-commits] debian-edu/ 01/02: debian-edu-profile: drop sugar from supported profiles as it has been removed from Jessie, see #782504.

[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-install.

commit 365b789a2c2d4bbc80fd95c81c2d661bcaaf9f97
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 13:12:00 2015 +0200

    debian-edu-profile: drop sugar from supported profiles as it has been removed from Jessie, see #782504.
---
 debian-edu-profile | 6 ------
 debian/changelog   | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian-edu-profile b/debian-edu-profile
index b96ba30..c7c8fdc 100755
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -62,7 +62,6 @@ check_profiles() {
     networked=false
     standalone=false
     minimal=false
-    sugar=false
 
     for value in `echo $EDUPROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
 	case $value in
@@ -94,11 +93,6 @@ check_profiles() {
 		server=true
 		log "Added task '$value'"
 		;;
-	    Sugar)
-		standalone=true
-		sugar=true
-		log "Added task '$value'"
-		;;
 	    Standalone)
 		standalone=true
 		if test "$networked" = true ; then
diff --git a/debian/changelog b/debian/changelog
index a20baa2..b396e77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 debian-edu-install (1.820) UNRELEASED; urgency=medium
 
+  [ Wolfgang Schweer ]
   * preseed-values/defaults.thin-client-server:
     Remove preseeding for LTSP build-client-opts as this breaks PXE
     installs. Setting '--eatmydata' is now done in (d-e-config)
     share/ltsp/plugins/ltsp-build-client/Debian-custom/080-eatmydata.
     (Closes: #781515).
 
+  [ Holger Levsen ]
+  * debian-edu-profile: drop sugar from supported profiles as it has been
+    removed from Jessie, see #782504.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 01 Apr 2015 10:54:46 +0200
 
 debian-edu-install (1.819) unstable; urgency=medium

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