From: Vincent Bernat Date: Sun, 5 Jul 2009 07:53:17 +0000 (+0200) Subject: Imported Debian patch 0.2.2-1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c4c802ef40ed3e2c71502c3d71f5f047f8168cc1;p=roundcube.git Imported Debian patch 0.2.2-1 --- diff --git a/debian/changelog b/debian/changelog index f2856bc..347ce08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +roundcube (0.2.2-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version. No changes required. + * Remove *.js.src which are not needed at runtime. + * Don't send email contents to Google by default by using php5-pspell + instead. Thanks to Anand Kumria. Closes: #529563. + * Update debconf translations: + + Basque, thanks to Piarres Beobide. Closes: #534282. + + -- Vincent Bernat Sun, 05 Jul 2009 09:53:17 +0200 + roundcube (0.2.1-2) unstable; urgency=low * Update debconf translations: diff --git a/debian/control b/debian/control index a67f432..9c96ec3 100644 --- a/debian/control +++ b/debian/control @@ -5,13 +5,13 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf Homepage: http://www.roundcube.net/ -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube 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, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1 +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers diff --git a/debian/control.in b/debian/control.in index 46da523..615a3c9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,13 +5,13 @@ Maintainer: Debian Roundcube Maintainers , Romain Beauxis Build-Depends: @cdbs@, po-debconf Homepage: http://www.roundcube.net/ -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-roundcube/roundcube 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, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1 +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers @@ -40,7 +40,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers - metapackag Package: roundcube-mysql Architecture: all -Depends: php-mdb2-driver-mysql, mysql-client | virtual-mysql-client, ${misc:Depends} +Depends: php-mdb2-driver-mysql (>= 1.5.0b2), mysql-client | virtual-mysql-client, ${misc:Depends} Suggests: mysql-server Description: metapackage providing MySQL dependencies for RoundCube This package provides MySQL dependencies for RoundCube Webmail, a @@ -49,7 +49,7 @@ Description: metapackage providing MySQL dependencies for RoundCube Package: roundcube-pgsql Architecture: all -Depends: php-mdb2-driver-pgsql, postgresql-client-8.1 | postgresql-client, ${misc:Depends} +Depends: php-mdb2-driver-pgsql (>= 1.5.0b2), postgresql-client-8.1 | postgresql-client, ${misc:Depends} Suggests: postgresql-server Description: metapackage providing PostgreSQL dependencies for RoundCube This package provides PostgreSQL dependencies for RoundCube Webmail, @@ -58,7 +58,7 @@ Description: metapackage providing PostgreSQL dependencies for RoundCube Package: roundcube-sqlite Architecture: all -Depends: php-mdb2-driver-sqlite, sqlite, ${misc:Depends} +Depends: php-mdb2-driver-sqlite (>= 1.5.0b2), sqlite, ${misc:Depends} Description: metapackage providing sqlite dependencies for RoundCube This package provides sqlite dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this diff --git a/debian/patches/series b/debian/patches/series index 853b6e7..f899621 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ dbconfig-common_support.patch correct_install_path.patch use_packaged_tinymce.patch correct-magic-path.patch +use_pspell.patch diff --git a/debian/patches/use_pspell.patch b/debian/patches/use_pspell.patch new file mode 100644 index 0000000..843097d --- /dev/null +++ b/debian/patches/use_pspell.patch @@ -0,0 +1,13 @@ +Instead of using Google by default, we use pspell to avoid to send each mail to Google... + +--- roundcube-0.1/config/main.inc.php.dist~ 2009-05-15 12:22:29.000000000 +0200 ++++ roundcube-0.1/config/main.inc.php.dist 2009-07-05 09:59:26.000000000 +0200 +@@ -199,7 +199,7 @@ + + // Set the spell checking engine. 'googie' is the default. 'pspell' is also available, + // but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. +-$rcmail_config['spellcheck_engine'] = 'googie'; ++$rcmail_config['spellcheck_engine'] = 'pspell'; + + // For a locally installed Nox Spell Server, please specify the URI to call it. + // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 diff --git a/debian/po/eu.po b/debian/po/eu.po index 18f7b42..3998bd3 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -79,10 +79,8 @@ msgstr "RoundCube-rekin erabiliko d(ir)en IMAP zerbitzaria(k):" #. Type: string #. Description #: ../templates:4001 -#, fuzzy -#| msgid "Please select the IMAP server that should be used with RoundCube." msgid "Please select the IMAP server(s) that should be used with RoundCube." -msgstr "Mesedez hautatu RoundCube-rekin erabiliko den IMAP zerbitzaria." +msgstr "Mesedez hautatu RoundCube-rekin erabiliko den IMAP zerbitzaria(k)." #. Type: string #. Description diff --git a/debian/rules b/debian/rules index 17cb182..c04db28 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,7 @@ binary-install/roundcube-core:: rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/bin/*.sh find $(CURDIR)/debian/roundcube-core -name '._*' -print0 | xargs -r0 rm find $(CURDIR)/debian/roundcube-core -name '.htaccess' -print0 | xargs -r0 rm + find $(CURDIR)/debian/roundcube-core -name '*.js.src' -print0 | xargs -r0 rm # Remove files shipped in tinymce package rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce