merging git tree

git-svn-id: https://svn.ic-s.nl/svn/dbmail/branches/dbmail_2_2_branch@2367 7b491191-dbf0-0310-aff6-d879d4d69008

9 files changed, 33 insertions, 30 deletions

diff --git a/debian/changelog b/debian/changelog
index d0224153..9e7258c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-dbmail (2.2.0rc1-1) experimental; urgency=low
+dbmail (2.2.0rc2-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Paul J Stevens <paul@nfg.nl>  Fri, 10 Nov 2006 15:38:02 +0100
+
+dbmail (2.2.0rc1-1) unstable; urgency=low
 
   * release candidate
   * 
diff --git a/debian/dbmail-ldap.config b/debian/dbmail-ldap.config
index 9802a44a..ad878041 100755
--- a/debian/dbmail-ldap.config
+++ b/debian/dbmail-ldap.config
@@ -7,12 +7,12 @@ MAILNAMEFILE=/etc/mailname
 . /usr/share/debconf/confmodule
 
 read_config() {
-	for line in `grep -E '^[^#$]' $CONFIGFILE|awk -F'#' '{print $1}'`; do
+	for line in `grep -E '^[^# $]' $CONFIG|sed 's/[\t ]//g'|awk -F'#' '{print $1}'`; do
 		NEWSECTION=`echo $line|grep '^\['|sed 's/\(\[\)\(.*\)\(\]\)/\2/'`
 		if [ -n "$NEWSECTION" ]; then
 			SECTION=`echo $NEWSECTION|tr '[A-Z]' '[a-z]'`
 		else
-			key=`echo $line|cut -f1 -d'='`
+			key=`echo $line|cut -f1 -d'='|tr '[A-Z]' '[a-z]'`
 			val=`echo $line|cut -f2- -d'='`
 			if [ -n "$val" ]; then
 				eval "db_set dbmail/$SECTION/$key \"$val\"" || true
@@ -30,7 +30,7 @@ init_config() {
 db_capb backup
 
 STATE=1
-LASTSTATE=3
+LASTSTATE=2
 while [ 1 ]; do
 
 	[ "$STATE" = "0" ] && break
diff --git a/debian/dbmail-mysql.config b/debian/dbmail-mysql.config
index af3b093f..71557fb8 100755
--- a/debian/dbmail-mysql.config
+++ b/debian/dbmail-mysql.config
@@ -2,6 +2,6 @@
 
 . /usr/share/debconf/confmodule
 
-db_set dbmail/mysql_installed "true"
+db_input medium dbmail/mysql_installed || true
 
 exit 0	
diff --git a/debian/dbmail-pgsql.config b/debian/dbmail-pgsql.config
index a45de061..81133801 100644
--- a/debian/dbmail-pgsql.config
+++ b/debian/dbmail-pgsql.config
@@ -2,6 +2,6 @@
 
 . /usr/share/debconf/confmodule
 
-db_set dbmail/pgsql_installed "true"
+db_input medium dbmail/pgsql_installed || true
 
 exit 0	
diff --git a/debian/dbmail-sieve.config b/debian/dbmail-sieve.config
index 5d27bf65..0196e2d2 100755
--- a/debian/dbmail-sieve.config
+++ b/debian/dbmail-sieve.config
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-#export DEBCONF_DEBUG=developer
+export DEBCONF_DEBUG=developer
 CONFIGFILE=/etc/dbmail/dbmail.conf
 DEBIANCONF=/etc/default/dbmail
 MAILNAMEFILE=/etc/mailname
@@ -8,7 +8,7 @@ MAILNAMEFILE=/etc/mailname
 . /usr/share/debconf/confmodule
 
 read_config() {
-	for line in `grep -E '^[^#$]' $CONFIGFILE|awk -F'#' '{print $1}'`; do
+	for line in `grep -E '^[^# $]' $CONFIG|sed 's/[\t ]//g'|awk -F'#' '{print $1}'`; do
 		NEWSECTION=`echo $line|grep '^\['|sed 's/\(\[\)\(.*\)\(\]\)/\2/'`
 		if [ -n "$NEWSECTION" ]; then
 			SECTION=`echo $NEWSECTION|tr '[A-Z]' '[a-z]'`
@@ -31,14 +31,14 @@ init_config() {
 		# setup some defaults
 		db_set dbmail/sieve/start_timsieved "false"
 		# overwrite them with the values in the config file
-		[ "$START_SIEVE" ] && db_set dbmail/sieve/start_timsieved "$START_SIEVE" || true
+		[ -n "$START_SIEVE" ] && db_set dbmail/sieve/start_timsieved "$START_SIEVE" || true
 	fi
 }
 
 db_capb backup
 
 STATE=1
-LASTSTATE=3
+LASTSTATE=2
 while [ 1 ]; do
 
 	[ "$STATE" = "0" ] && break
@@ -46,27 +46,24 @@ while [ 1 ]; do
 
 	case "$STATE" in
 	1)
-		db_input medium dbmail/do_debconf || true
-	;;	
-	2)
 		db_get dbmail/do_debconf
 		if [ "$RET" = "false" ]; then
 			break
 		fi
 		init_config
 
-		db_input medium dbmail/sieve/sieve || true           
+		db_input medium dbmail/delivery/sieve || true           
 	;;
 
-	3)
-		db_get dbmail/sieve/sieve
+	2)
+		db_get dbmail/delivery/sieve
 		if [ "$RET" = "false" ]; then
 			break
 		fi
 		db_input medium dbmail/sieve/start_timsieved || true
-		db_input medium dbmail/sieve/subaddress || true           
-		db_input medium dbmail/sieve/sieve_vacation || true           
-		db_input medium dbmail/sieve/sieve_notify || true           
+		db_input medium dbmail/delivery/subaddress || true           
+		db_input medium dbmail/delivery/sieve_vacation || true           
+		db_input medium dbmail/delivery/sieve_notify || true           
 	;;
 	esac
 	if db_go; then
diff --git a/debian/dbmail-sieve.postinst b/debian/dbmail-sieve.postinst
index 36ce1129..b6755b3d 100644
--- a/debian/dbmail-sieve.postinst
+++ b/debian/dbmail-sieve.postinst
@@ -38,11 +38,11 @@ case "$1" in
 
 	if [ "$DO_DEBCONF" = "true" ]; then
 		# fetch debconf values
-		db_get dbmail/sieve/sieve || true; SIEVE_SIEVE=$RET
+		db_get dbmail/delivery/sieve || true; SIEVE_SIEVE=$RET
 		db_get dbmail/sieve/start_timsieved || true; START_TIMSIEVED=$RET
-		db_get dbmail/sieve/subaddress || true; SIEVE_SUBADDR=$RET
-		db_get dbmail/sieve/sieve_vacation || true; SIEVE_VACATION=$RET
-		db_get dbmail/sieve/sieve_notify || true; SIEVE_NOTIFY=$RET
+		db_get dbmail/delivery/subaddress || true; SIEVE_SUBADDR=$RET
+		db_get dbmail/delivery/sieve_vacation || true; SIEVE_VACATION=$RET
+		db_get dbmail/delivery/sieve_notify || true; SIEVE_NOTIFY=$RET
 
 	fi
 
diff --git a/debian/dbmail-sieve.templates b/debian/dbmail-sieve.templates
index ed22a8ba..d35654e3 100644
--- a/debian/dbmail-sieve.templates
+++ b/debian/dbmail-sieve.templates
@@ -1,4 +1,4 @@
-Template: dbmail/sieve/sieve
+Template: dbmail/delivery/sieve
 Type: boolean
 _Description: Run sieve scripts during message delivery?
 
@@ -9,15 +9,15 @@ _Description: start the timesieved after reboot?
  You can run dbmail-timsieved which allows management of the sieve scripts from
  within clients that support this protocol such as kmail, squirrelmail, and others
 
-Template: dbmail/sieve/subaddress
+Template: dbmail/delivery/subaddress
 Type: boolean
 _Description: Do you wish to activate the sieve subaddress extension?
 
-Template: dbmail/sieve/sieve_vacation
+Template: dbmail/delivery/sieve_vacation
 Type: boolean
 _Description: Do you wish to activate the sieve vacation extension?
 
-Template: dbmail/sieve/sieve_notify
+Template: dbmail/delivery/sieve_notify
 Type: boolean
 _Description: Do you wish to activate the sieve notify extension?
 
diff --git a/debian/dbmail-sqlite.config b/debian/dbmail-sqlite.config
index 0e807083..cfa239f0 100644
--- a/debian/dbmail-sqlite.config
+++ b/debian/dbmail-sqlite.config
@@ -2,6 +2,6 @@
 
 . /usr/share/debconf/confmodule
 
-db_set dbmail/sqlite_installed "true"
+db_input medium dbmail/sqlite_installed || true
 
 exit 0	
diff --git a/debian/dbmail.config b/debian/dbmail.config
index 61175985..b4bad1bf 100644
--- a/debian/dbmail.config
+++ b/debian/dbmail.config
@@ -8,12 +8,12 @@ MAILNAMEFILE=/etc/mailname
 . /usr/share/debconf/confmodule
 
 read_config() {
-	for line in `grep -E '^[^#$]' $CONFIGFILE|awk -F'#' '{print $1}'`; do
+	for line in `grep -E '^[^# $]' $CONFIG|sed 's/[\t ]//g'|awk -F'#' '{print $1}'`; do
 		NEWSECTION=`echo $line|grep '^\['|sed 's/\(\[\)\(.*\)\(\]\)/\2/'`
 		if [ -n "$NEWSECTION" ]; then
 			SECTION=`echo $NEWSECTION|tr '[A-Z]' '[a-z]'`
 		else
-			key=`echo $line|cut -f1 -d'='`
+			key=`echo $line|cut -f1 -d'='|tr '[A-Z]' '[a-z]'`
 			val=`echo $line|cut -f2- -d'='`
 			if [ -n "$val" ]; then
 				eval "db_set dbmail/$SECTION/$key \"$val\"" || true