[debian-edu-commits] debian-edu/ 01/01: Revert choose-mirror change, as it did not allow us to install from unstable, and installing testing is working again.

[Petter Reinholdtsen]

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

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

commit 9ff7caf537dfe8149058590b2a8451c457ccf0ac
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Aug 31 09:27:19 2014 +0200

    Revert choose-mirror change, as it did not allow us to install from unstable, and installing testing is working again.
---
 debian/changelog | 3 ---
 tasks/common     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e7d0ca..b2e7b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,6 @@ debian-edu (1.724~0.git.2014-08-30) unstable; urgency=low
     changelog entry, so we add an extra paragraph like this one until it's
     uploaded.
 
-  * Allow choose-mirror on the jessie CD to allow us to test using
-    unstable while testing is broken.
-
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 30 Aug 2014 10:05:34 +0200
 
 debian-edu (1.723) unstable; urgency=high
diff --git a/tasks/common b/tasks/common
index acb8b4b..bd3f6e9 100644
--- a/tasks/common
+++ b/tasks/common
@@ -198,7 +198,7 @@ NeedConfig:  No
 Avoid:       libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-oss, \
              libsdl1.2debian-nas, atlas3-base, atlas3-sse, \
              atlas3-sse2, atlas3-3dnow, elilo, acorn-fdisk, \
-             aspell-fo, biff, bison, bootp, gpm, \
+             aspell-fo, biff, bison, bootp, choose-mirror, gpm, \
              gs-aladdin, ipmasqadm, mailutils, net-retriever, \
              netcfg-static, palo, pidentd, postfix-ldap, postfix-pcre, \
              inetutils-ping, netkit-ping, python-newt, sendmail-doc, \

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