[Fai-commit] r2986 - trunk/debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-03 22:48:33 +0000 (Thu, 03 Nov 2005)
New Revision: 2986

Modified:
   trunk/debian/control
Log:
conflicts not needed in for all packages


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-11-03 22:26:44 UTC (rev 2985)
+++ trunk/debian/control	2005-11-03 22:48:33 UTC (rev 2986)
@@ -8,7 +8,6 @@
 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
@@ -42,7 +41,6 @@
 Architecture: all
 Depends: fai-server, fai-client, fai-kernels, dhcp3-server, nfs-server, syslinux, tftp-hpa, apt-move, mkisofs
 Recommends: mkinitrd-cd
-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