Patch to use UTF-8 by default.

[roundcube.git] / debian / roundcube-core.postinst

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index 80a085aaaa2c5065473e49250dd3e95636ce4558..07e961f70b6b4409b6cbfef8880eb6c739ea08ca 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -39,58 +39,6 @@ apache_install() {
 case "$1" in
     configure)
 
-       # From 0.1-beta2.2 to 0.1-rc1, a column was added to table
-       # `identities'. For MySQL and PostgreSQL, this is handled by
-       # dbconfig-common but for sqlite, there is no way to add a
-       # column to a table. Therefore, we dump here the table and add
-       # the column.
-       [ "$dbc_upgrade" = "true" ] && {
-           case "$dbc_dbtype" in
-               sqlite)
-                   db="${dbc_basepath}/${dbc_dbname}"
-               # OK, we need to check if the table contains html_signature
-                   if ! sqlite "$db" '.schema identities' | grep -q html_signature; then
-                       # We need to add it
-                       echo -n "Need to upgrade 'identities' table in $db... "
-                       upgrade_tmp=$(mktemp -t roundcube.sqlite.XXXXXXXXXX)
-                       (
-                           cat <<EOF
-BEGIN TRANSACTION;
-DROP TABLE identities;
-CREATE TABLE identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  del tinyint NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-
-CREATE INDEX ix_identities_user_id ON identities(user_id);
-
-EOF
-                           # We dump and keep only inserts
-                           sqlite "$db" '.dump identities' | \
-                               awk '/^INSERT INTO/ {start = 1} {if (start == 1) print}' | \
-                               head -n -2 | \
-                               sed 's/^\(INSERT INTO identities \)/\1(identity_id, user_id, del, standard, name, organization, email, "reply-to", bcc, signature) /'
-                           echo 'COMMIT;' ) > $upgrade_tmp
-                       sqlite "$db" < $upgrade_tmp
-                       rm $upgrade_tmp
-                       echo "OK"
-                   fi
-                   ;;
-               *)
-                   # Do nothing
-                   ;;
-           esac
-       }
-
        CONFFILE=/etc/roundcube/main.inc.php
        touch $CONFFILE.ucftmp
        chmod 640 $CONFFILE.ucftmp
@@ -123,7 +71,7 @@ EOF
        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\['locale_string'\] = '\).*\(';\)\$+\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
@@ -151,10 +99,12 @@ EOF
        if [ "$res" = "true" ]; then
             for webserver in $restart; do
                webserver=${webserver%,}
+               # Redirection of 3 is needed because Debconf uses it and it might
+                # be inherited by webserver. See bug #446324.
                if [ -x /usr/sbin/invoke-rc.d ]; then
-                    invoke-rc.d $webserver restart
+                    invoke-rc.d $webserver reload 3>/dev/null || true
                else
-                    /etc/init.d/$webserver restart
+                    /etc/init.d/$webserver reload 3>/dev/null || true
                fi
             done
        fi