[debian-edu-commits] debian-edu/ 01/01: In main-server, add 8.0 netboot installer debs as an alternative to the 7.0 packages listed currently. This change only take effect once bug #766960 is fixed.

[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 d8f1f97a016ed03d64dac3d724e042a1b744994c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Nov 22 23:35:11 2014 +0100

    In main-server, add 8.0 netboot installer debs as an alternative to the 7.0 packages listed currently.  This change only take effect once bug #766960 is fixed.
---
 debian/changelog  | 8 ++++++++
 tasks/main-server | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bfb15a..bcafd21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu (1.810) UNRELEASED; urgency=low
+
+  * In main-server, add 8.0 netboot installer debs as an alternative to
+    the 7.0 packages listed currently.  This change only take effect
+    once bug #766960 is fixed.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 22 Nov 2014 23:34:46 +0100
+
 debian-edu (1.809) unstable; urgency=medium
 
   [ Holger Levsen ]
diff --git a/tasks/main-server b/tasks/main-server
index 7ce2a13..0769a42 100644
--- a/tasks/main-server
+++ b/tasks/main-server
@@ -30,8 +30,8 @@ Responsible: Andreas B. Mundt
 NeedConfig:  yes - touch the corresponding bind zone file
 
 Depends:     isc-dhcp-server-ldap, pxelinux, syslinux-common, \
-             debian-installer-7.0-netboot-i386, \
-             debian-installer-7.0-netboot-amd64, \
+             debian-installer-8.0-netboot-i386 | debian-installer-7.0-netboot-i386, \
+             debian-installer-8.0-netboot-amd64 | debian-installer-7.0-netboot-amd64, \
              atftpd | tftpd-hpa
 Recommends:  memtest86+
 Why:         Automatic distribution of IP addresses to the clients,

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