X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=blobdiff_plain;f=debian%2Fcontrol;h=c297b868a9e632743154bfbba93fbc09c9c81d32;hp=d939f9b3c4c2ff00f44ea87d305d387ffc1580fa;hb=f340e39c052e828327e6171654630b63128f3f07;hpb=72bb520d92f551b10d68eac0bf9d65fc3f5ef132

diff --git a/debian/control b/debian/control
index d939f9b..c297b86 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth
 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>
 Build-Depends: cdbs, debhelper (>= 5), dh-buildinfo, po-debconf, yui-compressor
 Homepage: http://www.roundcube.net/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://anonscm.debian.org/pkg-roundcube/roundcube.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-roundcube/roundcube.git
 
@@ -15,14 +15,13 @@ Depends: dbconfig-common, debconf | debconf-2.0, ucf,
  apache2 | lighttpd | httpd,
  php5, php5-mcrypt, php5-gd, php5-intl,
  php-mdb2 (>= 2.5.0), php-auth, php-net-smtp (>= 1.4.2),
- php-net-socket, php-mail-mime (>= 1.8.0), php5-pspell,
- tinymce (>= 3), libjs-jquery (>= 1.6.4),
+ php-net-socket, php-mail-mime (>= 1.8.2), php5-pspell,
+ tinymce (>= 3), libjs-jquery (>= 1.6.4), libjs-jquery-ui (>= 1.8),
  libmagic1,
- roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}),
+ roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}),
  ${misc:Depends}
 Suggests: php-auth-sasl (>= 1.0.3), php-crypt-gpg, roundcube-plugins
-Replaces: roundcube
-Breaks: roundcube (<< 0.1~rc2-2)
+Conflicts: roundcube-plugins-extra (<= 0.6-20111030)
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
@@ -65,14 +64,6 @@ Description: metapackage providing PostgreSQL dependencies for RoundCube
  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: 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.
-
 Package: roundcube-plugins
 Architecture: all
 Depends: roundcube-core (= ${source:Version}), ${misc:Depends}