Imported Debian patch 0.5.1+dfsg-6

diff --git a/debian/changelog b/debian/changelog
index eb1d082cfdacc202e92f6c5c60ac3e8935f350b9..38d56ed2456873417ac029520f43ee1d4800fb11 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.5.1+dfsg-6) unstable; urgency=low
+
+  * Handle incorrect upgrade from 0.3.1-6 when "changed" column already
+    exists for table "identities". Closes: #617312.
+
+ -- Vincent Bernat <bernat@debian.org>  Tue, 08 Mar 2011 07:37:56 +0100
+
 roundcube (0.5.1+dfsg-5) unstable; urgency=low
 
   * Don't use awk. Use plain shell to modify main.inc.php.

diff --git a/debian/roundcube-core.postinst b/debian/roundcube-core.postinst
index aed1d06cb896b05c1691b58b524cb601f314a7a4..f033b52b7a2f89d41ef8fbfd0f37d2c986fdfe66 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 and #613586)
-       if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.5.1+dfsg-2; then
+       if [ -n "$2" ] && dpkg --compare-versions "$2" le 0.5.1+dfsg-5; then
            db_get roundcube/dbconfig-upgrade || true
            if [ x"$RET" = x"true" ]; then
                if [ x"$dbc_dbtype" = x"mysql" ]; then
@@ -65,6 +65,7 @@ EOF
                    cat <<EOF | while read command; do dbc_mysql_exec_command "$command" || true ; done
 ALTER TABLE \`messages\` ADD INDEX \`index_index\` (\`user_id\`, \`cache_key\`, \`idx\`);
 ALTER TABLE \`contacts\`ADD INDEX \`user_contacts_index\` (\`user_id\`,\`email\`);
+ALTER TABLE \`identities\` ADD \`changed\` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER \`user_id\`;
 ALTER TABLE \`identities\` ADD INDEX \`user_identities_index\` (\`user_id\`, \`del\`);
 EOF
                fi

diff --git a/debian/sql/mysql/0.5-1 b/debian/sql/mysql/0.5-1
index bca74271e67686cc21d62391e7c49b0a94813fe8..193896f1df3f7798a083488843eafdb5e2cfeb52 100644 (file)
--- a/debian/sql/mysql/0.5-1
+++ b/debian/sql/mysql/0.5-1
@@ -46,7 +46,7 @@ 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 `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
+-- ALTER TABLE `identities` ADD `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
 
 CREATE TABLE `contactgroups` (
   `contactgroup_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,