From ee52a19347b3e6bb10f8e95796700b73739ead41 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Mon, 2 Jan 2012 21:45:37 +0100 Subject: [PATCH] More SQL fixes on update. Closes: #654297. --- debian/changelog | 3 ++- debian/patches/sql-fixes.patch | 9 +++++++++ debian/sql/pgsql/0.7-1 | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c7555b..0ddd225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ roundcube (0.7-3) unstable; urgency=low + Depend on libjs-jquery-ui package (instead of builtin copy). + Conflict with versions of roundcube-plugins-extra providing this plugin. + * More SQL fixes on update. Closes: #654297. - -- Vincent Bernat Mon, 26 Dec 2011 21:24:11 +0100 + -- Vincent Bernat Mon, 02 Jan 2012 21:45:42 +0100 roundcube (0.7-2) unstable; urgency=low diff --git a/debian/patches/sql-fixes.patch b/debian/patches/sql-fixes.patch index 1b11749..a0c15ee 100644 --- a/debian/patches/sql-fixes.patch +++ b/debian/patches/sql-fixes.patch @@ -33,3 +33,12 @@ Various SQL fixes for 0.7. +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/pgsql/0.7-1 b/debian/sql/pgsql/0.7-1 index cb4ae9b..10c7f23 100644 --- a/debian/sql/pgsql/0.7-1 +++ b/debian/sql/pgsql/0.7-1 @@ -24,7 +24,7 @@ CREATE TABLE searches ( CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name) ); -DROP SEQUENCE messages_ids; +DROP SEQUENCE message_ids; DROP TABLE messages; CREATE TABLE cache_index ( -- 2.39.2