[debian-edu-commits] debian-edu/ 01/01: Drop class lenny in cf/cfengine.conf and cf/cf.kdm.

[Holger Levsen]

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

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

commit cbcfa4fdbe1877358911307b504ee6d6208f9d87
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 21 15:09:55 2014 +0200

    Drop class lenny in cf/cfengine.conf and cf/cf.kdm.
---
 cf/cf.kdm        | 5 ++---
 cf/cfengine.conf | 1 -
 debian/changelog | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cf/cf.kdm b/cf/cf.kdm
index f43ff6c..d1eea43 100644
--- a/cf/cf.kdm
+++ b/cf/cf.kdm
@@ -1,6 +1,6 @@
 shellcommands:
 
-  debian.!standalone.installation.lenny::
+  debian.::
 
     "/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'General' FifoDir ''"
     "/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Core' AllowShutdown None"
@@ -8,8 +8,7 @@ shellcommands:
     "/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-\:*-Core' AllowRootLogin true"
     "/usr/bin/update-ini-file /etc/kde3/kdm/kdmrc 'X-*-Greeter' UserList false"
 
-  # For Squeeze
-  debian.!standalone.installation.!lenny::
+  debian.!standalone.installation.!::
     "/usr/bin/update-ini-file /etc/kde4/kdm/kdmrc 'X-\:*-Core' AllowRootLogin false"
     # Make sure to not show the last user that logged in
     "/usr/bin/update-ini-file /etc/kde4/kdm/kdmrc 'X-\:*-Greeter' PreselectUser None"
diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index 599a123..e3cc34a 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -78,7 +78,6 @@ control:
 
 groups:
 
-	lenny			= ( "/bin/egrep -q '5.0|lenny' /etc/debian_version" )
 	server			= ( "/bin/grep -q 'Main-Server' /etc/debian-edu/config" )
 	installation		= ( "/usr/bin/test -e /sbin/start-stop-daemon.REAL" )
 	testinstall		= ( "/bin/grep -q 'TESTINSTALL=\"true\"' /etc/debian-edu/config" )
diff --git a/debian/changelog b/debian/changelog
index abd8a64..87cfb9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debian-edu-config (1.812) UNRELEASED; urgency=low
     debian-edu package.
   * Drop debian/TODO.Squeeze, the content was obsolete anyway.
   * Drop cf/cf.pdns, we switched backed to bind9.
+  * Drop class lenny in cf/cfengine.conf and cf/cf.kdm.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 20 Oct 2014 20:54:21 +0200
 

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