New upstream version. Closes: #656093.

diff --git a/debian/changelog b/debian/changelog
index 0ddd225482e2b2d60af1c5e7047d88c19d78d41a..a7d8fecb9959efa6344e7014af1c0de1d116adbb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+roundcube (0.7.1-1) unstable; urgency=low
+
+  * New upstream version. Closes: #656093.
+
+ -- Vincent Bernat <bernat@debian.org>  Tue, 17 Jan 2012 08:57:11 +0100
+
 roundcube (0.7-3) unstable; urgency=low
 
   * Ship jqueryui plugin. Closes: #653274.

diff --git a/debian/patches/series b/debian/patches/series
index a9316a2de563cc1dd8ca5fa764e6344670d50a55..0ffb987e42024597e2701da1d36bf4c1eab15c4a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@ use_pspell.patch
 loginbox-size.patch
 default-charset-utf8.patch
 debianize_password_plugin.patch
-sql-fixes.patch
 use-debian-jquery-ui.patch

diff --git a/debian/patches/sql-fixes.patch b/debian/patches/sql-fixes.patch
deleted file mode 100644 (file)
index a0c15ee..0000000
--- a/debian/patches/sql-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Various SQL fixes for 0.7.
---- roundcubemail/SQL/mysql.update.sql (revision 5468)
-+++ roundcubemail/SQL/mysql.update.sql (revision 5618)
-@@ -147,4 +147,6 @@
- 
- -- Updates from version 0.6
-+
-+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
- 
- ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL;
-@@ -210,4 +212,6 @@
- ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
- 
-+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-+
- -- Updates from version 0.7-beta
- 
---- roundcubemail/SQL/sqlite.update.sql        (revision 5468)
-+++ roundcubemail/SQL/sqlite.update.sql        (revision 5615)
-@@ -247,5 +247,5 @@
- );
- 
--CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name);
-+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
- 
- DROP TABLE messages;
---- roundcubemail/SQL/sqlite.initial.sql       (revision 5460)
-+++ roundcubemail/SQL/sqlite.initial.sql       (revision 5615)
-@@ -148,5 +148,5 @@
- );
- 
--CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name);
-+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
- 
- -- --------------------------------------------------------
---- roundcubemail/SQL/postgres.update.sql      (revision 5468)
-+++ roundcubemail/SQL/postgres.update.sql      (revision 5627)
-@@ -128,5 +128,5 @@
- );
- 
--DROP SEQUENCE messages_ids;
-+DROP SEQUENCE message_ids;
- DROP TABLE messages;
- 

diff --git a/debian/sql/mysql/0.7.1-1 b/debian/sql/mysql/0.7.1-1
new file mode 100644 (file)
index 0000000..920a5e1
--- /dev/null
+++ b/debian/sql/mysql/0.7.1-1
@@ -0,0 +1,18 @@
+-- Updates from version 0.7
+
+ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
+ALTER TABLE `contacts` DROP INDEX `user_contacts_index`;
+ALTER TABLE `contacts` MODIFY `email` text NOT NULL DEFAULT '';
+ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`);
+ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
+   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `cache` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_index` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_thread` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_messages` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contacts` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contactgroups` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT;
+ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT;

diff --git a/debian/sql/pgsql/0.7.1-1 b/debian/sql/pgsql/0.7.1-1
new file mode 100644 (file)
index 0000000..81a0cb8
--- /dev/null
+++ b/debian/sql/pgsql/0.7.1-1
@@ -0,0 +1,5 @@
+-- Updates from version 0.7
+
+DROP INDEX contacts_user_id_idx;
+CREATE INDEX contacts_user_id_idx ON contacts USING btree (user_id, del);
+ALTER TABLE contacts ALTER email TYPE text;

diff --git a/debian/sql/sqlite/0.7.1-1 b/debian/sql/sqlite/0.7.1-1
new file mode 100644 (file)
index 0000000..9d92276
--- /dev/null
+++ b/debian/sql/sqlite/0.7.1-1
@@ -0,0 +1,38 @@
+-- Updates from version 0.7
+
+CREATE TABLE contacts_tmp (
+  contact_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL,
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  email text 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_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts;
+
+DROP TABLE contacts;
+
+CREATE TABLE contacts (
+  contact_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL,
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  email text 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, words)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, del);
+DROP TABLE contacts_tmp;