From: Vincent Bernat <bernat@debian.org>
Date: Sun, 5 Jul 2009 08:00:53 +0000 (+0000)
Subject: Don't send email contents to Google by default by using php5-pspell
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2dd5ecefa3af4baff12e090fbf346be084c03af4;p=roundcube.git

Don't send email contents to Google by default by using php5-pspell
instead. Thanks to Anand Kumria. Closes: #529563.
---

diff --git a/debian/changelog b/debian/changelog
index c9ec65f..ddf9de2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-roundcube (0.2.1-3) UNRELEASED; urgency=low
+roundcube (0.2.2-dep-1) UNRELEASED; urgency=low
 
+  * New upstream release
+  * 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 <bernat@debian.org>  Thu, 25 Jun 2009 20:56:25 +0200
+ -- Vincent Bernat <bernat@debian.org>  Sun, 05 Jul 2009 09:53:17 +0200
 
 roundcube (0.2.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a67f432..0a661f1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,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, 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..98d1fb2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,7 +11,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, 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/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