[debian-edu-commits] r81531 - in branches/wheezy/debian-edu: debian tasks

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-12 08:48:36 +0000 (Fri, 12 Jul 2013)
New Revision: 81531

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/common
Log:
Remove choose-mirror from avoid list, to allow it on the netinst
CD and make it possible to specify proxy setting before the
profile question.

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-07-12 04:48:01 UTC (rev 81530)
+++ branches/wheezy/debian-edu/debian/changelog	2013-07-12 08:48:36 UTC (rev 81531)
@@ -12,6 +12,9 @@
     sure bluetooth support is included by default in Xfce and LXDE.
   * Change valgrind from suggests to recommends in the common task,
     to make it easier to debug crash bugs without Internet access.
+  * Remove choose-mirror from avoid list, to allow it on the netinst
+    CD and make it possible to specify proxy setting before the
+    profile question.
 
  -- Holger Levsen <holger at debian.org>  Fri, 05 Jul 2013 15:10:47 +0200
 

Modified: branches/wheezy/debian-edu/tasks/common
===================================================================
--- branches/wheezy/debian-edu/tasks/common	2013-07-12 04:48:01 UTC (rev 81530)
+++ branches/wheezy/debian-edu/tasks/common	2013-07-12 08:48:36 UTC (rev 81531)
@@ -190,7 +190,7 @@
 Avoid:       libsdl1.2debian-all, libsdl1.2debian-arts, libsdl1.2debian-oss, \
              libsdl1.2debian-nas, atlas3-base, atlas3-sse, \
              atlas3-sse2, atlas3-3dnow, apt-file, 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, \