[debian-edu-commits] debian-edu/ 01/01: Also drop tests for kdm and network for the Sugar profile as Sugar 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-config.

commit 10c4fb56d79cf55fab53165039cfd07b66231d61
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Apr 14 14:57:25 2015 +0200

    Also drop tests for kdm and network for the Sugar profile as Sugar has been removed from Jessie, see #782504.
---
 debian/changelog  | 4 ++--
 testsuite/kdm     | 4 ++--
 testsuite/network | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58e519d..a73bbf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 debian-edu-config (1.818) UNRELEASED; urgency=high
 
-  * testsuite/taskpkgs: drop tests for sugar as sugar has been removed from
-    Jessie, see #782504.
+  * testsuite/taskpkgs, kdm and network: drop tests for the Sugar profile as
+    Sugar has been removed from Jessie, see #782504.
 
  -- Holger Levsen <holger at debian.org>  Tue, 14 Apr 2015 13:08:20 +0200
 
diff --git a/testsuite/kdm b/testsuite/kdm
index 75479cf..29533da 100755
--- a/testsuite/kdm
+++ b/testsuite/kdm
@@ -8,8 +8,8 @@ if test -r /etc/debian-edu/config ; then
     . /etc/debian-edu/config
 fi
 
-# Standalone Main-Server and Sugar do not install kdm
-if [ "$PROFILE" = Main-Server ] || [ "$PROFILE" = Sugar ] ; then
+# Standalone Main-Server does not install kdm
+if [ "$PROFILE" = Main-Server ] ; then
     exit 0
 fi
 
diff --git a/testsuite/network b/testsuite/network
index 8df344c..46675cd 100755
--- a/testsuite/network
+++ b/testsuite/network
@@ -94,10 +94,6 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
       Minimal)
         networked=true
         ;;
-      Sugar)
-        networked=false
-        standalone=true
-        ;;
       *)
         error "unknown profile '$profile'"
         ;;

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