From 929345b765b04508db3eb35102c2e8382bb7a4ed Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sat, 5 Apr 2008 18:16:33 +0200 Subject: [PATCH] Imported Debian patch 0.1.1-1 --- debian/changelog | 15 +++++++- debian/control | 2 +- debian/patches/dbconfig-common_support.patch | 2 +- .../patches/fix-too-old-php-mail-mime.patch | 3 ++ debian/patches/mysql-update-fix.patch | 11 ++++++ debian/patches/series | 2 +- debian/po/es.po | 35 +++++++------------ debian/rules | 15 ++++++-- debian/sql/mysql/0.1~rc1~dfsg-1 | 21 +++++++++++ debian/sql/pgsql/0.1~rc1~dfsg-1 | 12 +++++++ debian/sql/sqlite/0.1~rc1~dfsg-1 | 27 ++++++++++++++ 11 files changed, 115 insertions(+), 30 deletions(-) create mode 100644 debian/patches/mysql-update-fix.patch create mode 100644 debian/sql/mysql/0.1~rc1~dfsg-1 create mode 100644 debian/sql/pgsql/0.1~rc1~dfsg-1 create mode 100644 debian/sql/sqlite/0.1~rc1~dfsg-1 diff --git a/debian/changelog b/debian/changelog index ccb58ec..cde4a3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,22 @@ +roundcube (0.1.1-1) unstable; urgency=low + + * New upstream release + - Copy old SQL upgrade scripts into debian/sql to allow upgrade from + versions older than 0.1 + - Patch new MySQL upgrade script to fix a typo + * Debconf translation updates: + - Spanish. Closes: #473788 + * Depends on php-mail-mime (>= 1.5.0) and drop compatibility patch + * Install upstream changelog in /usr/share/doc/roundcube* + + -- Vincent Bernat Sat, 05 Apr 2008 18:16:33 +0200 + roundcube (0.1-4) unstable; urgency=low * Debconf translation updates: - French. Closes: #469802 - Russian. Closes: #469847 - - Galician. Closes: #698666 + - Galician. Closes: #469866 - German. Closes: #469875 - Finnish. Closes: #469922 - Italian. Closes: #469987 diff --git a/debian/control b/debian/control index fa128c6..cb1c41f 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube Package: roundcube-core Architecture: all -Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}, libmagic1 +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce, ${misc:Depends}, libmagic1 Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch index 4063b3c..a4be31d 100644 --- a/debian/patches/dbconfig-common_support.patch +++ b/debian/patches/dbconfig-common_support.patch @@ -5,7 +5,7 @@ $rcmail_config = array(); -// PEAR database DSN for read/write operations --// format is db_provider://user:password@host/databse +-// format is db_provider://user:password@host/database -// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql - -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; diff --git a/debian/patches/fix-too-old-php-mail-mime.patch b/debian/patches/fix-too-old-php-mail-mime.patch index d1af6b6..61ed729 100644 --- a/debian/patches/fix-too-old-php-mail-mime.patch +++ b/debian/patches/fix-too-old-php-mail-mime.patch @@ -1,3 +1,6 @@ +This patch is not used any more with php-mail-mime (>= 1.5.0). +It is left here to help with backports. Add it back to series if needed. + --- roundcube/program/steps/mail/sendmail.inc 2008-03-07 09:52:40.000000000 +0100 +++ roundcube/program/steps/mail/sendmail.inc.new 2008-03-07 11:04:33.000000000 +0100 @@ -351,7 +351,11 @@ diff --git a/debian/patches/mysql-update-fix.patch b/debian/patches/mysql-update-fix.patch new file mode 100644 index 0000000..1610b59 --- /dev/null +++ b/debian/patches/mysql-update-fix.patch @@ -0,0 +1,11 @@ +--- roundcubemail-0.1.1-dep/SQL/mysql.update.sql~ 2008-04-05 14:49:21.000000000 +0200 ++++ roundcubemail-0.1.1-dep/SQL/mysql.update.sql 2008-04-05 18:09:10.000000000 +0200 +@@ -5,7 +5,7 @@ + + ALTER TABLE `messages` + DROP INDEX `idx`, +- DROP INDEX `uid` ++ DROP INDEX `uid`; + + ALTER TABLE `cache` + DROP INDEX `cache_key`, diff --git a/debian/patches/series b/debian/patches/series index e679d9a..2bb76e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ use_packaged_tinymce.patch use-db-backend.patch correct-magic-path.patch disable-tinymce-spellchecker.patch -fix-too-old-php-mail-mime.patch +mysql-update-fix.patch diff --git a/debian/po/es.po b/debian/po/es.po index 379041b..bb04156 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -30,11 +30,11 @@ msgstr "" "Project-Id-Version: roundcube_0.1~rc1~dfsg-1\n" "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" "POT-Creation-Date: 2008-03-05 22:12+0100\n" -"PO-Revision-Date: 2007-05-28 10:47+0200\n" +"PO-Revision-Date: 2008-04-01 18:21+0200\n" "Last-Translator: Carlos Galisteo \n" "Language-Team: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect @@ -53,7 +53,7 @@ msgstr "lighttpd" #. Description #: ../templates:2002 msgid "Web server(s) to configure automatically:" -msgstr "Servidores Web a reconfigurar automáticamente" +msgstr "Servidores web a reconfigurar automáticamente:" #. Type: multiselect #. Description @@ -61,9 +61,7 @@ msgstr "Servidores Web a reconfigurar automáticamente" msgid "" "RoundCube supports any web server supported by PHP, however only Apache 2 " "and lighttpd can be configured automatically." -msgstr "" -"RoundCube funciona con cualquier servidor Web que soporte PHP, sin " -"embargo sólo Apache 2 y lighttpd se configuran automáticamente." +msgstr "RoundCube funciona con cualquier servidor web que soporte PHP, sin embargo sólo se configuran automáticamente Apache 2 y lighttpd." #. Type: multiselect @@ -72,15 +70,13 @@ msgstr "" msgid "" "Please select the web server(s) that should be configured automatically for " "RoundCube." -msgstr "" -"Por favor, seleccione el servidor o servidores Web que se deben configurar " -"automáticamente para RoundCube." +msgstr "Seleccione el/los servidor/es web que debe/n configurarse automáticamente para RoundCube." #. Type: boolean #. Description #: ../templates:3001 msgid "Should the webserver(s) be restarted now?" -msgstr "¿Deben reiniciarse ahora el servidor o servidores Web?" +msgstr "¿Debe/n reiniciarse ahora el/los servidor/es web?" #. Type: boolean #. Description @@ -88,20 +84,19 @@ msgstr "¿Deben reiniciarse ahora el servidor o servidores Web?" msgid "" "In order to activate the new configuration, the reconfigured web server(s) " "have to be restarted." -msgstr "" -"Para activar la nueva configuración, deben reiniciarse el servidor o servidores Web." +msgstr "Debe/n reiniciarse el/los servidor/es web para activar la nueva configuración." #. Type: string #. Description #: ../templates:4001 msgid "IMAP server(s) used with RoundCube:" -msgstr "Servidor IMAP usado por RoundCube:" +msgstr "Servidor/es IMAP usado/s por RoundCube:" #. Type: string #. Description #: ../templates:4001 msgid "Please select the IMAP server that should be used with RoundCube." -msgstr "Por favor, seleccione el servidor IMAP que se debe usar con RoundCube." +msgstr "Seleccione el/los servidor/es IMAP que se usará/n con RoundCube." #. Type: string #. Description @@ -110,20 +105,14 @@ msgid "" "If this is left blank, a text box will be displayed at login. Entering a " "space-separated list of hosts will display a pull-down menu. Entering a " "single host will enforce using this host." -msgstr "" -"Si deja este campo en blanco se mostrará un espacio donde introducir texto al " -"autenticarse. Si proporciona una lista de equipos, separados por espacios, se " -"mostrará un menú desplegable. Si proporciona un único nombre de equipo se forzará " -"el uso del mismo." +msgstr "Se mostrará un campo al autenticarse que el usuario podrá rellenar si deja este campo en blanco. Si proporciona una lista de equipos separados por espacios, se mostrará un menú desplegable. Si proporciona un único nombre de equipo se forzará el uso de este equipo." #. Type: string #. Description #: ../templates:4001 msgid "" "To use SSL connections, please enter host names as 'ssl://hostname:993'." -msgstr "" -"Para usar conexiones SSL, por favor escriba los nombres de host como " -"'ssl://hostname:993'." +msgstr "Escriba los nombres de sistema como «ssl://hostname:9993» si desea usar conexiones SSL." #. Type: select #. Description @@ -135,7 +124,7 @@ msgstr "Idioma predeterminado:" #. Description #: ../templates:5001 msgid "Please choose the default language for RoundCube." -msgstr "Por favor, elija el idioma predeterminado para RoundCube." +msgstr "Elija el idioma predeterminado para RoundCube." #. Type: select #. Description diff --git a/debian/rules b/debian/rules index 54ba07c..1a625e9 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG + # In order to regenerate 'debian/control' : # DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean # Then check manually if everything's ok @@ -19,13 +21,20 @@ binary-install/roundcube-core:: # Install config/db.inc.php.dist install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php install -m 0640 $(CURDIR)/config/main.inc.php.dist $(CURDIR)/debian/roundcube-core/usr/share/roundcube + + # Database related files # Install empty tables and updates for each db type install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/mysql - install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.1~rc1~dfsg-1 install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/pgsql - install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/pgsql/0.1~rc1~dfsg-1 install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/install/sqlite - install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1~rc1~dfsg-1 + # Database upgrade from latest versions + install -m 0644 $(CURDIR)/SQL/postgres.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/pgsql/0.1.1-1 + install -m 0644 $(CURDIR)/SQL/mysql.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/mysql/0.1.1-1 + install -m 0644 $(CURDIR)/SQL/sqlite.update.sql $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/sqlite/0.1.1-1 + + # Old database upgrades + cp -r $(CURDIR)/debian/sql/* $(CURDIR)/debian/roundcube-core/usr/share/dbconfig-common/data/roundcube/upgrade/. + # Some files are executable while not being scripts or binary... find $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/localization -type f -print0 | xargs -0 chmod -x # Remove useless file diff --git a/debian/sql/mysql/0.1~rc1~dfsg-1 b/debian/sql/mysql/0.1~rc1~dfsg-1 new file mode 100644 index 0000000..e904be2 --- /dev/null +++ b/debian/sql/mysql/0.1~rc1~dfsg-1 @@ -0,0 +1,21 @@ +-- RoundCube Webmail update script for MySQL databases +-- Updates from version 0.1-beta and 0.1-beta2 + +TRUNCATE TABLE `messages`; + +ALTER TABLE `messages` + DROP `body`, + DROP INDEX `cache_key`, + ADD `structure` TEXT, + ADD UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`); + +ALTER TABLE `identities` + ADD `html_signature` tinyint(1) default 0 NOT NULL; + +ALTER TABLE `session` CHANGE `ip` `ip` VARCHAR(40) + +-- Uncomment these lines if you're using MySQL 4.1 or higher +-- ALTER TABLE `users` +-- DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci, +-- CHANGE `username` `username` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, +-- CHANGE `alias` `alias` VARCHAR( 128 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; diff --git a/debian/sql/pgsql/0.1~rc1~dfsg-1 b/debian/sql/pgsql/0.1~rc1~dfsg-1 new file mode 100644 index 0000000..0d63cf9 --- /dev/null +++ b/debian/sql/pgsql/0.1~rc1~dfsg-1 @@ -0,0 +1,12 @@ +-- RoundCube Webmail update script for Postres databases +-- Updates from version 0.1-beta and older + +ALTER TABLE "messages" DROP body; +ALTER TABLE "messages" ADD structure TEXT; +ALTER TABLE "messages" ADD UNIQUE (user_id, cache_key, uid); + +ALTER TABLE "identities" ADD html_signature INTEGER; +ALTER TABLE "identities" ALTER html_signature SET DEFAULT 0; +UPDATE identities SET html_signature = 0; +ALTER TABLE "identities" ALTER html_signature SET NOT NULL; + diff --git a/debian/sql/sqlite/0.1~rc1~dfsg-1 b/debian/sql/sqlite/0.1~rc1~dfsg-1 new file mode 100644 index 0000000..e725729 --- /dev/null +++ b/debian/sql/sqlite/0.1~rc1~dfsg-1 @@ -0,0 +1,27 @@ +-- RoundCube Webmail update script for SQLite databases +-- Updates from version 0.1-beta2 and older + +DROP TABLE messages; + +CREATE TABLE messages ( + message_id integer NOT NULL PRIMARY KEY, + user_id integer NOT NULL default '0', + del tinyint NOT NULL default '0', + cache_key varchar(128) NOT NULL default '', + created datetime NOT NULL default '0000-00-00 00:00:00', + idx integer NOT NULL default '0', + uid integer NOT NULL default '0', + subject varchar(255) NOT NULL default '', + "from" varchar(255) NOT NULL default '', + "to" varchar(255) NOT NULL default '', + cc varchar(255) NOT NULL default '', + date datetime NOT NULL default '0000-00-00 00:00:00', + size integer NOT NULL default '0', + headers text NOT NULL, + structure text +); + +CREATE INDEX ix_messages_user_id ON messages(user_id); +CREATE INDEX ix_messages_cache_key ON messages(cache_key); +CREATE INDEX ix_messages_idx ON messages(idx); +CREATE INDEX ix_messages_uid ON messages(uid); -- 2.39.2