[Fai-commit] r6220 - branches/stable/3.4/debian

[Michael Prokop]

Author: mika
Date: 2010-11-30 22:41:04 +0000 (Tue, 30 Nov 2010)
New Revision: 6220

Modified:
   branches/stable/3.4/debian/control
Log:
Adjust depends/recommends regarding tftp server.

fai-server package recommended 'tftpd-hpa | tftpd', now we're
using 'tftpd-hpa | atftpd' instead as tftpd is not suitable for use
with the PXE bootloader at all.

fai-quickstart package depended on tftpd-hpa without any alternatives,
now we support atftpd as alternative.

Backport of svn r6199 for stable branch 3.4.

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/control
===================================================================
--- branches/stable/3.4/debian/control	2010-11-30 22:41:00 UTC (rev 6219)
+++ branches/stable/3.4/debian/control	2010-11-30 22:41:04 UTC (rev 6220)
@@ -41,7 +41,7 @@
 Package: fai-server
 Architecture: all
 Depends: fai-client, debootstrap
-Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl
+Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | atftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl
 Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk
 Conflicts: fai
 Replaces: fai
@@ -62,7 +62,7 @@
 
 Package: fai-quickstart
 Architecture: all
-Depends: fai-server, fai-doc, isc-dhcp-server | dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, apt-move, genisoimage, openbsd-inetd | inet-superserver
+Depends: fai-server, fai-doc, isc-dhcp-server | dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa | atftpd, apt-move, genisoimage, openbsd-inetd | inet-superserver
 Description: Fully Automatic Installation quickstart package
  FAI is a non-interactive system to install, customize and manage
  Linux systems and software configurations on computers as well as