Finished removing php4 dependencies

diff --git a/debian/README.Debian b/debian/README.Debian
index ce794abc6c9eba99b81508929d5bf6fe44101f32..160a9c6d6cd2f15fb4c87390152bf9d823b460b2 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,11 +1,9 @@
 Debian does not allow complex dependencies. Upon install, you need to
 check that you have the correct packages installed.
 
-If you want to use MySQL, you need mysql-client, php4-mysql or
-php5-mysql. For PostgreSQL, you need postgresql-client, php4-pgsql or
-php5-pgsql. For SQLite, you need sqlite and php5-sqlite.
-
-From Roundcube documentation, php4-sqlite is not supported !
+If you want to use MySQL, you need mysql-client and php5-mysql. 
+For PostgreSQL, you need postgresql-client and php5-pgsql. 
+For SQLite, you need sqlite and php5-sqlite.
 
 For better compatibility, the schema used for MySQL is the one
 targeted at MySQL 4.0, not the one for MySQL 4.1 or MySQL 5.x.

diff --git a/debian/control b/debian/control
index 66d5348d4ad05c78f3b980657ef0897c9b433245..f7b1505078818ae503e55908bd7a18465ef1a3b6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: roundcube
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5 | php4, php5-mysql | php4-mysql | php5-pgsql | php4-pgsql | php5-sqlite, php5-mcrypt | php4-mcrypt, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
 Suggests: mysql-server | posgresql-server
 Description: modern, skinnable, AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an

diff --git a/debian/control.in b/debian/control.in
index 12602041707594ed446fe7e425adf93627ea23f7..0974d7dbc9c1c67ad53cfbe57e48d30f5500d92b 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: roundcube
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5 | php4, php5-mysql | php4-mysql | php5-pgsql | php4-pgsql | php5-sqlite | php4-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
 Suggests: mysql-server | posgresql-server
 Description: modern, skinnable, AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an