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

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:55:24 +0000 (Tue, 17 Aug 2010)
New Revision: 5999

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/debian/control
Log:
Fix debian/control

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

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:55:19 UTC (rev 5998)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:55:24 UTC (rev 5999)
@@ -46,6 +46,7 @@
     faimond-gui,setup-storage,Commands.pm,Exec.pm,Fstab.pm,Init.pm,
     Parser.pm,Sizes.pm,Volumes.pm: add $Id$
   * savelog.LAST: ignore ACPI Warning
+  * control: fix duplicate Depends on iproute
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: branches/stable/3.4/debian/control
===================================================================
--- branches/stable/3.4/debian/control	2010-08-17 12:55:19 UTC (rev 5998)
+++ branches/stable/3.4/debian/control	2010-08-17 12:55:24 UTC (rev 5999)
@@ -41,7 +41,7 @@
 Package: fai-server
 Architecture: all
 Depends: fai-client, debootstrap
-Recommends: nfs-kernel-server, dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, iproute, fai-setup-storage
+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
 Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
 Conflicts: fai
 Replaces: fai
@@ -62,7 +62,7 @@
 
 Package: fai-quickstart
 Architecture: all
-Depends: fai-server, fai-doc, 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, 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