Really fix 544579

diff --git a/debian/changelog b/debian/changelog
index 51699f90bba8a28fea573cbdeaceafc035fb201e..b696f8065dbe652e155252bfe52eb210971c524b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.3-2) unstable; urgency=low
+
+  * Really fix #544579 since the default value is null without
+    quotes. This really Closes: #544579.
+
+ -- Vincent Bernat <bernat@debian.org>  Sun, 27 Sep 2009 11:14:18 +0200
+
 roundcube (0.3-1) unstable; urgency=low
 
   * New upstream release. Closes: #545498.

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index b41830dda73d51a0745cbc04013ae682217bfc96..07e961f70b6b4409b6cbfef8880eb6c739ea08ca 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -71,7 +71,7 @@ case "$1" in
        cat /usr/share/roundcube/main.inc.php.dist | \
            sed -e "s+^\(\$rcmail_config\['default_host'\] = \)''\(;\)\$+\1${hosts}\2+" \
                -e "s+^\(\$rcmail_config\['des_key'\] = '\).*\(';\)\$+\1$deskey\2+" \
-               -e "s+^\(\$rcmail_config\['language'\] = '\).*\(';\)\$+\1${language}\2+" >> $CONFFILE.ucftmp
+               -e "s+^\(\$rcmail_config\['language'\] = \).*\(;\)\$+\1'${language}'\2+" >> $CONFFILE.ucftmp
 
        ucf --debconf-ok $CONFFILE.ucftmp $CONFFILE
        chown root:www-data $CONFFILE