Remove all "ADD INDEX" from MySQL 0.5-1 upgrade file and put them in

postinst script. Also add a note in NEWS.Debian file about this
problem. Closes: #613586.

diff --git a/debian/changelog b/debian/changelog
index 41c0685d3677a990e05ae8c705a22116871add8d..6e85f770b806545407a13b7735ca001a26252dea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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. Also add a note in NEWS.Debian file about this
+    problem. Closes: #613586.
+
+ -- Vincent Bernat <bernat@debian.org>  Wed, 16 Feb 2011 08:40:34 +0100
+
 roundcube (0.5.1+dfsg-1) unstable; urgency=low
 
   * Add plugins. Closes: #550454.

diff --git a/debian/roundcube-core.NEWS b/debian/roundcube-core.NEWS
index 58abf9acf02ad5d36d86784d2fe31819d61a6dbc..635fe433b695b9159180f1fae6201d95ddd723de 100644 (file)
--- a/debian/roundcube-core.NEWS
+++ b/debian/roundcube-core.NEWS
@@ -1,3 +1,18 @@
+roundcube (0.5.1+dfsg-2) unstable; urgency=low
+
+    Upgrades to 0.5.X using a MySQL database and with the help of
+    dbconfig-common may have been incomplete. If you got error from
+    dbconfig-common about a problem during migration from 0.3.1-6 to
+    0.5-1 or if some features are missing, most notably identities and
+    address book management, please reexecute all commands in this
+    file (with "-f" flag of mysql command):
+      /usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.5-1
+
+    More information can be found here:
+     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613586
+
+ -- Vincent Bernat <bernat@debian.org>  Wed, 16 Feb 2011 08:40:34 +0100
+
 roundcube (0.3.1-2) unstable; urgency=low
 
     Starting from Roundcube 0.3, an incompatibility with Suhosin session

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index f4e2a8273a9cf551480fd564f46e099c43c821c8..e574daeb58fa37b7e3d70bc947aaa17255c330cd 100644 (file)
--- a/debian/roundcube-core.postinst
+++ b/debian/roundcube-core.postinst
@@ -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` (