[debian-edu-commits] debian-edu/ 01/01: Allow choose-mirror on the jessie CD to allow us to test using unstable while testing is broken.

[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 8ab8b1aa6b59cca3e5c990eaec8fd718c12f2df8
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Aug 30 14:51:44 2014 +0200

    Allow choose-mirror on the jessie CD to allow us to test using unstable while testing is broken.
---
 debian/changelog | 3 +++
 tasks/common     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b2e7b8e..1e7d0ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ 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 bd3f6e9..acb8b4b 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, choose-mirror, gpm, \
+             aspell-fo, biff, bison, bootp, 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