From 1913cf4b7a24545621b1c1d0301bebe059ee14e7 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Wed, 16 Feb 2011 20:54:48 +0100 Subject: [PATCH] Imported Debian patch 0.5.1+dfsg-2 --- debian/changelog | 11 +++++++++++ debian/roundcube-core.postinst | 3 ++- debian/sql/mysql/0.5-1 | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41c0685..6e2c388 100644 --- 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 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 f4e2a82..64bdf5d 100644 --- 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 f9eecba..bca7427 100644 --- 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` ( -- 2.39.2