diff -Nru fai-3.4.8ubuntu2/debian/changelog fai-3.4.8ubuntu3/debian/changelog --- fai-3.4.8ubuntu2/debian/changelog 2012-03-20 10:03:34.000000000 +0000 +++ fai-3.4.8ubuntu3/debian/changelog 2012-07-31 14:33:42.000000000 +0100 @@ -1,3 +1,11 @@ +fai (3.4.8ubuntu3) quantal; urgency=low + + * Switch Depends: to isc-dhcp-server following dhcp3-server to + isc-dhcp-server transition. Note that the existing code already + handles the appropriate configuration file names. + + -- Andy Whitcroft Tue, 31 Jul 2012 14:28:22 +0100 + fai (3.4.8ubuntu2) precise; urgency=low * In the case FAI is started in an Upstart environment, check if an diff -Nru fai-3.4.8ubuntu2/debian/control fai-3.4.8ubuntu3/debian/control --- fai-3.4.8ubuntu2/debian/control 2011-05-10 11:37:53.000000000 +0100 +++ fai-3.4.8ubuntu3/debian/control 2012-07-31 14:30:16.000000000 +0100 @@ -1,7 +1,8 @@ Source: fai Section: admin Priority: extra -Maintainer: Thomas Lange +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Thomas Lange Uploaders: Holger Levsen , Michael Prokop Standards-Version: 3.9.2 Build-Depends-Indep: asciidoc, asciidoc (>= 8.3) | lynx, w3m, dblatex, docbook-xsl, libxml2-utils @@ -41,7 +42,7 @@ Package: fai-server Architecture: all Depends: fai-client, debootstrap -Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | atftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl +Recommends: nfs-kernel-server, isc-dhcp-server, tftpd-hpa | atftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage, libproc-daemon-perl Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk Conflicts: fai Replaces: fai @@ -62,7 +63,7 @@ Package: fai-quickstart Architecture: all -Depends: fai-server, fai-doc, isc-dhcp-server | dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa | atftpd, apt-move, genisoimage, openbsd-inetd | inet-superserver +Depends: fai-server, fai-doc, isc-dhcp-server, nfs-kernel-server, syslinux-common, tftpd-hpa | atftpd, 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