X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fcontrol;h=789ab6a49549f19ceaf35e4786f0c89d24971854;hb=6fcb1a1d123ced1e653be67abb7a6668a99f066d;hp=59efe28c122dbf018a9f8868a85321d2a0bba8ae;hpb=3d2772f0e7df2b58c4272c109a3cf5dd09a24144;p=roundcube.git

diff --git a/debian/control b/debian/control
index 59efe28..789ab6a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,16 @@ Source: roundcube
 Section: web
 Priority: extra
 Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>
-Uploaders: Vincent Bernat <bernat@luffy.cx>, Romain Beauxis <toots@rastageeks.org>
-Build-Depends: debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf
+Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>
+Build-Depends: cdbs, debhelper, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), po-debconf
 Homepage: http://www.roundcube.net/
-Standards-Version: 3.7.3
-DM-Upload-Allowed: yes
-Vcs-Svn: svn://svn.debian.org/pkg-roundcube/roundcube
+Standards-Version: 3.8.3
+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, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}
+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, libjs-jquery (>= 1.3.3)
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
@@ -24,12 +23,12 @@ Description: skinnable AJAX based webmail solution for IMAP servers
  The user interface is fully skinnable using XHTML and CSS 2.
  .
  This package provides the core code for roundcube. You should install
- it along with one of the roundcube database virtual packages.
+ it along with one of the roundcube database metapackages.
 
 Package: roundcube
 Architecture: all
-Depends: roundcube-sqlite | roundcube-db, roundcube-core
-Description: skinnable AJAX based webmail solution for IMAP servers
+Depends: roundcube-core (= ${source:Version}), ${misc:Depends}
+Description: skinnable AJAX based webmail solution for IMAP servers - metapackage
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
  expected from an e-mail client, including MIME support, address book,
@@ -41,29 +40,26 @@ Description: skinnable AJAX based webmail solution for IMAP servers
 
 Package: roundcube-mysql
 Architecture: all
-Depends: php5-mysql, mysql-client | virtual-mysql-client
+Depends: php-mdb2-driver-mysql (>= 1.5.0b2), mysql-client | virtual-mysql-client, ${misc:Depends}
 Suggests: mysql-server
-Provides: roundcube-db
-Description: virtual package providing MySQL dependencies for RoundCube
+Description: metapackage providing MySQL dependencies for RoundCube
  This package provides MySQL dependencies for RoundCube Webmail, a
  skinnable AJAX based webmail solution for IMAP servers. Install this
  one if you want to use a MySQL database with RoundCube.
 
 Package: roundcube-pgsql
 Architecture: all
-Depends: php5-pgsql, postgresql-client-8.1 | postgresql-client 
+Depends: php-mdb2-driver-pgsql (>= 1.5.0b2), postgresql-client-8.1 | postgresql-client, ${misc:Depends}
 Suggests: postgresql-server
-Provides: roundcube-db
-Description: virtual package providing PostgreSQL dependencies for RoundCube
+Description: metapackage providing PostgreSQL dependencies for RoundCube
  This package provides PostgreSQL dependencies for RoundCube Webmail,
  a skinnable AJAX based webmail solution for IMAP servers. Install
  this one if you want to use a PostgreSQL database with RoundCube.
 
 Package: roundcube-sqlite
 Architecture: all
-Depends: php5-sqlite, sqlite
-Provides: roundcube-db
-Description: virtual package providing sqlite dependencies for RoundCube
+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
  one if you want to use a sqlite database with RoundCube.