[Fai-commit] r4662 - trunk/debian

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-09 13:14:01 +0000 (Fri, 09 Nov 2007)
New Revision: 4662

Modified:
   trunk/debian/control
Log:
fai-nfsroot and fai-client conflicts to fai-kernels


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-11-09 13:10:00 UTC (rev 4661)
+++ trunk/debian/control	2007-11-09 13:14:01 UTC (rev 4662)
@@ -12,7 +12,7 @@
 Architecture: all
 Section: admin
 Depends: perl, file, libapt-pkg-perl
-Conflicts: fai
+Conflicts: fai, fai-kernels
 Replaces: fai
 Description: Fully Automatic Installation client package
  FAI is a non-interactive system to install a Debian GNU/Linux operating
@@ -65,6 +65,7 @@
 Architecture: all
 Section: admin
 Depends: fai-client
+Conflicts: fai, fai-kernels
 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