debian: Delete config (script-config) files in schroot preinst

2 files changed, 17 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 0bea8339..a301f71c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+schroot (1.5.2-2) UNRELEASED; urgency=low
+
+  * 
+
+ -- Roger Leigh <rleigh@debian.org>  Thu, 10 May 2012 00:13:57 +0100
+
 schroot (1.5.2-1) experimental; urgency=low
 
   * New upstream development release.
@@ -6,6 +12,9 @@ schroot (1.5.2-1) experimental; urgency=low
     - Fix typo (debuggging, Closes: #653732).  Thanks to Vincent Blut.
     - Build-Depend on debhelper 9, and po4a 0.40.
     - Upgrade to Standards-Version 3.9.3.
+  * schroot preinst: Remove default (script-config) conffiles on
+    upgrade.  These are deprecated and support will be dropped in
+    the future.
   * Support translation of the documentation with po4a
     (Closes: #588962).  Thanks to David Prévot.  Note that there are
     not yet any translations making use of this facility yet.
diff --git a/debian/schroot.preinst b/debian/schroot.preinst
index 7a2da2d9..ca3e4476 100644
--- a/debian/schroot.preinst
+++ b/debian/schroot.preinst
@@ -56,6 +56,14 @@ install|upgrade)
          rm_conffile "schroot" "/etc/schroot/copyfiles-defaults"
          rm_conffile "schroot" "/etc/schroot/nssdatabases-defaults"
     fi
+    if dpkg --compare-versions "$2" lt "1.5.2-1"; then
+         rm_conffile "schroot" "/etc/schroot/buildd/config"
+         rm_conffile "schroot" "/etc/schroot/default/config"
+         rm_conffile "schroot" "/etc/schroot/desktop/config"
+         rm_conffile "schroot" "/etc/schroot/minimal/config"
+         rm_conffile "schroot" "/etc/schroot/sbuild/config"
+
+    fi
 esac
 
 # dh_installdeb will replace this with shell code automatically