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

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:53:38 +0000 (Tue, 17 Aug 2010)
New Revision: 5978

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/debian/control
Log:
control: change dependencies on fai-setup-storage


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:53:34 UTC (rev 5977)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:53:38 UTC (rev 5978)
@@ -1,4 +1,4 @@
-fai (3.4~beta2) unstable; urgency=low
+fai (3.4~beta3) unstable; urgency=low
 
   [ Thomas Lange ]
   * dhcp-edit: new command that adds or removes entries to/from dhcpd.conf
@@ -15,12 +15,13 @@
   * disk-info: rename subroutine
   * faimond-gui: Tk::Balloon is not used atm.
   * subroutines: show rx and tx bytes for network device at the end
+  * control: change dependencies on fai-setup-storage
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks
     Michael Prokop <mika at debian.org> for the patch (closes: #575812)
 
- -- Thomas Lange <lange at debian.org>  Mon, 14 Jun 2010 20:26:25 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 25 Jun 2010 14:29:10 +0200
 
 fai (3.3.5) unstable; urgency=high
 

Modified: branches/stable/3.4/debian/control
===================================================================
--- branches/stable/3.4/debian/control	2010-08-17 12:53:34 UTC (rev 5977)
+++ branches/stable/3.4/debian/control	2010-08-17 12:53:38 UTC (rev 5978)
@@ -12,7 +12,7 @@
 
 Package: fai-client
 Architecture: all
-Depends: perl, file, libapt-pkg-perl, iproute, fai-setup-storage
+Depends: perl, file, libapt-pkg-perl, iproute
 Recommends: debconf-utils, cfengine2
 Conflicts: fai, fai-kernels
 Replaces: fai
@@ -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
+Recommends: nfs-kernel-server, dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, iproute, fai-setup-storage
 Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
 Conflicts: fai
 Replaces: fai
@@ -73,7 +73,7 @@
 
 Package: fai-nfsroot
 Architecture: all
-Depends: fai-client, live-initramfs
+Depends: fai-client, live-initramfs, fai-setup-storage
 Conflicts: fai, fai-kernels
 Description: Fully Automatic Installation nfsroot package
  FAI is a non-interactive system to install, customize and manage