From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 2 Oct 2011 13:29:32 +0000 (+0200)
Subject: New upstream version.
X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=commitdiff_plain;h=eadfecac02e9fdc413c37276edda9cc7ae43a030

New upstream version.
---

diff --git a/debian/changelog b/debian/changelog
index 5e8ceed..6628c72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+roundcube (0.6+dfsg-1) unstable; urgency=low
+
+  * New upstream version. Closes: #643707.
+      + Repack to remove SWF file without source from TinyMCE.      
+      + Add SQL upgrade procedures.
+      + Add new plugins: acl, enigma and newmail_notifier.
+
+ -- Vincent Bernat <bernat@debian.org>  Sun, 02 Oct 2011 15:20:57 +0200
+
 roundcube (0.5.4+dfsg-1) unstable; urgency=high
 
   [ Vincent Bernat ]
diff --git a/debian/roundcube-plugins.install b/debian/roundcube-plugins.install
index f05ac1a..8842867 100644
--- a/debian/roundcube-plugins.install
+++ b/debian/roundcube-plugins.install
@@ -1,15 +1,18 @@
+plugins/acl/ usr/share/roundcube/plugins
 plugins/additional_message_headers/ usr/share/roundcube/plugins
 plugins/archive/ usr/share/roundcube/plugins
 plugins/autologon/ usr/share/roundcube/plugins
 plugins/database_attachments/ usr/share/roundcube/plugins
 plugins/debug_logger/ usr/share/roundcube/plugins
 plugins/emoticons/ usr/share/roundcube/plugins
+plugins/enigma/ usr/share/roundcube/plugins
 plugins/help/ usr/share/roundcube/plugins
 plugins/http_authentication/ usr/share/roundcube/plugins
 plugins/managesieve/ usr/share/roundcube/plugins
 plugins/markasjunk/ usr/share/roundcube/plugins
 plugins/new_user_dialog/ usr/share/roundcube/plugins
 plugins/new_user_identity/ usr/share/roundcube/plugins
+plugins/newmail_notifier/ usr/share/roundcube/plugins
 plugins/password /usr/share/roundcube/plugins
 plugins/show_additional_headers/ usr/share/roundcube/plugins
 plugins/squirrelmail_usercopy/ usr/share/roundcube/plugins
diff --git a/debian/sql/mysql/0.6+dfsg-1 b/debian/sql/mysql/0.6+dfsg-1
new file mode 100644
index 0000000..8d64d12
--- /dev/null
+++ b/debian/sql/mysql/0.6+dfsg-1
@@ -0,0 +1,6 @@
+ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
+ALTER TABLE `contacts` CHANGE `vcard` `vcard` LONGTEXT /*!40101 CHARACTER SET utf8 */ NULL DEFAULT NULL;
+ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
+
+TRUNCATE TABLE `messages`;
+TRUNCATE TABLE `cache`;
diff --git a/debian/sql/pgsql/0.6+dfsg-1 b/debian/sql/pgsql/0.6+dfsg-1
new file mode 100644
index 0000000..779b598
--- /dev/null
+++ b/debian/sql/pgsql/0.6+dfsg-1
@@ -0,0 +1,5 @@
+ALTER TABLE contacts ADD words TEXT NULL;
+CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
+
+TRUNCATE messages;
+TRUNCATE cache;
diff --git a/debian/sql/sqlite/0.6+dfsg-1 b/debian/sql/sqlite/0.6+dfsg-1
new file mode 100644
index 0000000..c47cdbb
--- /dev/null
+++ b/debian/sql/sqlite/0.6+dfsg-1
@@ -0,0 +1,38 @@
+CREATE TABLE contacts_tmp (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
+
+DROP TABLE contacts;
+CREATE TABLE contacts (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default '',
+    words text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
+DROP TABLE contacts_tmp;
+
+DELETE FROM messages;
+DELETE FROM cache;
+CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);