Imported Debian patch 0.5.1+dfsg-2

diff --git a/debian/changelog b/debian/changelog
index 41c0685d3677a990e05ae8c705a22116871add8d..6e2c388a797eac51a48ac29417ea2354d6545f64 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+roundcube (0.5.1+dfsg-2) unstable; urgency=low
+
+  * Remove all "ADD INDEX" from MySQL 0.5-1 upgrade file and put them in
+    postinst script. If you have a problem during the upgrade, please, let
+    me know. This upload is only done to prevent users who did not upgrade
+    to 0.5 yet to have a problem during their upgrade. If you already
+    upgraded to 0.5 and if the upgrade failed (or if some feature are
+    missing like identities management), please look at bug #613586.
+
+ -- Vincent Bernat <bernat@debian.org>  Wed, 16 Feb 2011 20:54:48 +0100
+
 roundcube (0.5.1+dfsg-1) unstable; urgency=low
 
   * Add plugins. Closes: #550454.

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index f4e2a8273a9cf551480fd564f46e099c43c821c8..64bdf5d8a2192883e81cdefb693787177bc91af8 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -40,7 +40,7 @@ case "$1" in
     configure)
 
        # We try to fix an incomplete upgrade (see #610725)
-       if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.5-2; then
+       if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.5.1+dfsg-2; then
            db_get roundcube/dbconfig-upgrade || true
            if [ x"$RET" = x"true" ]; then
                # Ok, we may need to do some upgrade steps. Let's get
@@ -55,6 +55,7 @@ case "$1" in
 ALTER TABLE \`messages\` ADD INDEX \`index_index\` (\`user_id\`, \`cache_key\`, \`idx\`);
 ALTER TABLE \`session\` CHANGE \`vars\` \`vars\` MEDIUMTEXT NOT NULL;
 ALTER TABLE \`contacts\`ADD INDEX \`user_contacts_index\` (\`user_id\`,\`email\`);
+ALTER TABLE \`identities\` ADD INDEX \`user_identities_index\` (\`user_id\`, \`del\`);
 EOF
                fi
            fi

diff --git a/debian/sql/mysql/0.5-1 b/debian/sql/mysql/0.5-1
index f9eecba41977c617197cc19f06aa6096194c0fa2..bca74271e67686cc21d62391e7c49b0a94813fe8 100644 (file)
--- a/debian/sql/mysql/0.5-1
+++ b/debian/sql/mysql/0.5-1
@@ -45,7 +45,7 @@ ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
 ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
 ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
 
-ALTER TABLE `identities` ADD INDEX `user_identities_index` (`user_id`, `del`);
+-- ALTER TABLE `identities` ADD INDEX `user_identities_index` (`user_id`, `del`);
 ALTER TABLE `identities` ADD `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
 
 CREATE TABLE `contactgroups` (