[Fai-commit] r2951 - trunk/debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-10-17 23:19:13 +0000 (Mon, 17 Oct 2005)
New Revision: 2951

Modified:
   trunk/debian/control
Log:
add conflicts to old package fai


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-10-16 20:23:57 UTC (rev 2950)
+++ trunk/debian/control	2005-10-17 23:19:13 UTC (rev 2951)
@@ -8,6 +8,7 @@
 Package: fai-client
 Architecture: all
 Depends: perl, libapt-pkg-perl
+Conflicts: fai
 Description: Fully Automatic Installation client package
  FAI is a non-interactive system to install a Debian GNU/Linux operating
  system unattended on a PC cluster. You can take one or more virgin
@@ -18,6 +19,7 @@
 
 Package: fai-doc
 Architecture: all
+Conflicts: fai
 Description: Documentation for FAI
  FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
  systems. This is the documentation for FAI in various formats.
@@ -27,6 +29,7 @@
 Depends: fai-client
 Recommends: debootstrap, nfs-kernel-server | nfs-server, fai-kernels, dhcp3-server | bootp, tftpd-hpa | tftpd, rsh-server, wget, syslinux
 Suggests: ssh, debmirror, mknbi, apt-move, mkinitrd-cd, grub
+Conflicts: fai
 Description: Fully Automatic Installation server package
  FAI is a non-interactive system to install a Debian GNU/Linux operating
  system unattended on a PC cluster. You can take one or more virgin
@@ -38,6 +41,7 @@
 Package: fai-quickstart
 Architecture: all
 Depends: fai-server, dhcp3-server, nfs-server, syslinux, tftp-hpa
+Conflicts: fai
 Description: Fully Automatic Installation quickstart package
  FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
  systems. This package setups an install server with some basic
@@ -46,6 +50,7 @@
 Package: fai-nfsroot
 Architecture: all
 Depends: fai-client
+Conflicts: fai
 Description: Fully Automatic Installation nfsroot package
  FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
  systems. This package contains the software that is only needed in