[debian-edu-commits] debian-edu/ 01/01: Don't remove /etc/insserv/overrides/kdm manually, use d-m-h. Thanks to Andreas Beckmann for the hints. (Closes: #856682)

[Wolfgang Schweer]

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

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

commit 07bf34a402c6a264b7b44ae19b03e222368d3706
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Mar 4 09:27:41 2017 +0100

    Don't remove /etc/insserv/overrides/kdm manually, use d-m-h.
    Thanks to Andreas Beckmann for the hints. (Closes: #856682)
---
 debian/changelog                     | 5 +++--
 debian/debian-edu-config.maintscript | 1 +
 debian/debian-edu-config.postinst    | 6 ------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60ea16d..3573128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 debian-edu-config (1.924) UNRELEASED; urgency=medium
 
   * Use dpkg-maintscript-helper to remove obsolete conffiles.
-    debian/debian-edu-config.postinst: Remove unneeded code. 
-    Thanks to Andreas Beckmann for the hint. (Closes: #856682)
+    debian/debian-edu-config.postinst: Remove unneeded code,
+    don't remove /etc/insserv/overrides/kdm manually, use d-m-h.
+    Thanks to Andreas Beckmann for the hints. (Closes: #856682)
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 04 Mar 2017 00:37:59 +0100
 
diff --git a/debian/debian-edu-config.maintscript b/debian/debian-edu-config.maintscript
index ff05fed..76e4753 100644
--- a/debian/debian-edu-config.maintscript
+++ b/debian/debian-edu-config.maintscript
@@ -5,6 +5,7 @@ rm_conffile /etc/cfengine/debian-edu/cf.pdns 1.811
 rm_conffile /etc/insserv.conf.d/debian-edu-config 1.811
 rm_conffile /etc/powerdns/pdns.d/pdns-debian-edu.conf 1.811
 rm_conffile /etc/cfengine/debian-edu/cf.kdm 1.906
+rm_conffile /etc/insserv/overrides/kdm 1.906
 rm_conffile /etc/ldap/slapd-debian-edu.conf 1.911
 rm_conffile /etc/ldap/slapd-lenny_debian-edu.conf 1.911
 rm_conffile /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp 1.818+deb8u1
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index c72c318..1703bd3 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -155,12 +155,6 @@ configure)
 	fi
     fi
 
-    if dpkg --compare-versions "$2" le "1.906"; then
-	if [ -e /etc/insserv/overrides/kdm ] ; then
-            rm /etc/insserv/overrides/kdm
-	fi
-    fi
-
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf

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