[debian-edu-commits] debian-edu/ 01/01: Drop exim4 config on client machines. The default in Debian work fine with the preseeding we do in debian-edu-install version 1.810. Break on versions before 1.810.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit bf6516897771b30c3caa01cc8b92e563e4e4a3ef
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Oct 16 09:25:01 2014 +0200

    Drop exim4 config on client machines.  The default in Debian work fine with the preseeding we do in debian-edu-install version 1.810. Break on versions before 1.810.
---
 cf/cf.exim       | 6 ------
 debian/changelog | 3 +++
 debian/control   | 6 +++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cf/cf.exim b/cf/cf.exim
index 385c79a..3d9299c 100644
--- a/cf/cf.exim
+++ b/cf/cf.exim
@@ -15,12 +15,6 @@ links:
     /etc/exim4/exim4.conf ->! /etc/exim4/exim-ldap-server-v4.conf
 		nofile=force
 
-  # Non-Serverinstallation
-  debian.!server.installation::
-
-    /etc/exim4/exim4.conf ->! /etc/exim4/exim-ldap-client-v4.conf 
-		nofile=force
-
 editfiles:
   debian.server.installation::
     { /etc/default/exim4
diff --git a/debian/changelog b/debian/changelog
index 6b15cab..4eea430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     squid3 config file.
   * Drop our redundant auto-addfirmware script and use the equivalent
     isenkram-autoinstall-firmware from the isenkram-cli package instead.
+  * Drop exim4 config on client machines.  The default in Debian work
+    fine with the preseeding we do in debian-edu-install version 1.810.
+    Break on versions before 1.810.
 
   [ Holger Levsen ]
   * debian/rules: Convert to dh9 style rules.
diff --git a/debian/control b/debian/control
index e1365ff..3ce3068 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,11 @@ Depends: ${misc:Depends}
  , isenkram-cli
 Recommends: resolvconf, ddccontrol | xresprobe, syslinux, memtest86+, libnotify-bin, lsof, binutils
 Suggests: atftpd | tftpd-hpa
-Breaks: nslcd (<< 0.7.7), dhcp3-client (<< 4.1.1-P1-9), dhcp3-server (<< 4.1.1-P1-9), slapd (<< 2.4.23-5), debian-edu-install (<< 1.521~svn74617)
+Breaks: nslcd (<< 0.7.7)
+ , dhcp3-client (<< 4.1.1-P1-9)
+ , dhcp3-server (<< 4.1.1-P1-9)
+ , slapd (<< 2.4.23-5)
+ , debian-edu-install (<< 1.810)
 Description: Configuration files for Skolelinux systems
  Installs cfengine config files to be used by the machines set up as part
  of the Skolelinux project.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git