[Fai-commit] r6606 - trunk/debian

[Thomas Lange]

Author: lange
Date: 2011-07-20 13:58:27 +0000 (Wed, 20 Jul 2011)
New Revision: 6606

Modified:
   trunk/debian/control
Log:
remove Replaces and Conflicts to fai and fai-kernels


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2011-07-20 09:51:38 UTC (rev 6605)
+++ trunk/debian/control	2011-07-20 13:58:27 UTC (rev 6606)
@@ -14,8 +14,6 @@
 Architecture: all
 Depends: perl, file, libapt-pkg-perl, iproute
 Recommends: debconf-utils, cfengine2
-Conflicts: fai, fai-kernels
-Replaces: fai
 Description: Fully Automatic Installation client package
  FAI is a non-interactive system to install, customize and manage
  Linux systems and software configurations on computers as well as
@@ -29,7 +27,6 @@
 Package: fai-doc
 Architecture: all
 Section: doc
-Conflicts: fai
 Description: Documentation for FAI
  FAI is a non-interactive system to install, customize and manage
  Linux systems and software configurations on computers as well as
@@ -43,8 +40,6 @@
 Depends: fai-client, debootstrap
 Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | atftpd, openssh-server, openssh-client, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl
 Suggests: debmirror, reprepro, genisoimage, grub, aptitude, perl-tk
-Conflicts: fai
-Replaces: fai
 Description: Fully Automatic Installation server package
  FAI is a non-interactive system to install, customize and manage
  Linux systems and software configurations on computers as well as
@@ -74,7 +69,6 @@
 Package: fai-nfsroot
 Architecture: all
 Depends: fai-client, live-boot|live-initramfs, fai-setup-storage, syslinux-common
-Conflicts: fai, fai-kernels
 Description: Fully Automatic Installation nfsroot package
  FAI is a non-interactive system to install, customize and manage
  Linux systems and software configurations on computers as well as