[debian-edu-commits] debian-edu/ 01/02: Revert "Add code in postinst to remove the now obsolete conffiles."

[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 8ad932bffe0cb1ee1224cc6da82171cd5910d230
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 5 20:14:10 2015 +0100

    Revert "Add code in postinst to remove the now obsolete conffiles."
    
    This reverts commit 57a4fea9326ae289f199d99461a82b27f1750224.
---
 debian/changelog                  | 3 +--
 debian/debian-edu-config.postinst | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20453d5..58e6784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,7 @@ debian-edu-config (1.816) UNRELEASED; urgency=medium
   * etc/ldap/slapd-squeeze_debian-edu.conf: unset 'dbnosync' to avoid
     possible data loss. (Closes: #774610).
   * Remove unused (and outdated) files etc/ldap/slapd-debian-edu.conf
-    and etc/ldap/slapd-lenny_debian-edu.conf. Add code in postinst to
-    remove the now obsolete conffiles.
+    and etc/ldap/slapd-lenny_debian-edu.conf
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 01 Jan 2015 23:26:29 +0100
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index cf955b4..a0b192f 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -236,11 +236,6 @@ configure)
 	rm_conffile debian-edu-config /etc/powerdns/pdns.d/pdns-debian-edu.conf
     fi
 
-    if dpkg --compare-versions "$2" le "1.815"; then
-	rm_conffile debian-edu-config /etc/ldap/slapd-debian-edu.conf
-	rm_conffile debian-edu-config /etc/ldap/slapd-lenny_debian-edu.conf
-    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