[debian-edu-commits] debian-edu/ 02/02: 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 62eecd8a7016782035b551e125e5c1f4529e9b76
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.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                  | 4 ++--
 debian/debian-edu-config.postinst | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b8fb3e..a36bae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ debian-edu-config (1.911) UNRELEASED; urgency=medium
 
   * Update line number in debian/debian-edu-config.lintian-overrides.
   * Remove unused (and outdated) files etc/ldap/slapd-debian-edu.conf
-    and etc/ldap/slapd-lenny_debian-edu.conf. (Thanks to Wolfgang Schweer.)
+    and etc/ldap/slapd-lenny_debian-edu.conf and add code in postinst
+    to remove the now obsolete conffiles. (Thanks to Wolfgang Schweer.)
 
  -- Holger Levsen <holger at debian.org>  Sat, 10 Sep 2016 17:06:45 +0200
 
@@ -407,7 +408,6 @@ debian-edu-config (1.816) unstable; urgency=medium
     executed). (Closes: #774392).
   * etc/ldap/slapd-squeeze_debian-edu.conf: unset 'dbnosync' to avoid
     possible data loss. (Closes: #774610).
-    possible data loss.
 
  -- Holger Levsen <holger at debian.org>  Tue, 06 Jan 2015 00:36:14 +0100
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index a4ab444..21ba243 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -208,6 +208,11 @@ configure)
 	fi
     fi
 
+    if dpkg --compare-versions "$2" le "1.911"; 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