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

[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 57a4fea9326ae289f199d99461a82b27f1750224
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Jan 5 09:57:18 2015 +0100

    Add code in postinst to remove the now obsolete conffiles.
---
 debian/changelog                  | 3 ++-
 debian/debian-edu-config.postinst | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 58e6784..20453d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ 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
+    and etc/ldap/slapd-lenny_debian-edu.conf. Add code in postinst to
+    remove the now obsolete conffiles.
 
  -- 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 a0b192f..cf955b4 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -236,6 +236,11 @@ 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