From: Dinko Korunic <kreator@carnet.hr>
Date: Sat, 30 Aug 2008 11:31:44 +0000 (+0200)
Subject: - ispravni compare-versions i ciscenje DCC iz debconf baze
X-Git-Tag: v3.3.1-1~11
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=spamassassin-cn.git;a=commitdiff_plain;h=dd305df1c74dd0ec5c49b15f937e28daf4e5b209

- ispravni compare-versions i ciscenje DCC iz debconf baze
- ciscenje use_dcc i dcc_ opcija iz local.cf
---

diff --git a/debian/postinst b/debian/postinst
index 19fba5d..29e233c 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -37,7 +37,7 @@ db_version 2.0
 umask 022
 
 # clean up old debconf questions that are no longer in this package
-if dpkg --compare-versions "$2" lt-nl "3.1.7-4"; then
+if dpkg --compare-versions "$2" lt "2:3.1.7-4"; then
     db_unregister spamassassin-cn/usedcc || true
 fi
 
@@ -194,7 +194,7 @@ if [ -f $examdir/local.cf ]; then
     done
 
     # remove obsolete options from old SA
-    egrep -v '^(bayes_use_chi2_combining|ok_languages|pyzor)' \
+    egrep -v '^(bayes_use_chi2_combining|ok_languages|use_pyzor|pyzor_|use_dcc|dcc_)' \
         $confdir/local.cf.$$ > $confdir/local.cf.$$.$$ && \
             mv -f $confdir/local.cf.$$.$$ $confdir/local.cf.$$
     rm -f $confdir/local.cf.$$.$$