Depend on php-mdb2-* (>= 1.5.0b2) since it is needed to fix some

bugs. Closes: #519104, #519293. Remove not needed any more patch
from  debian/patches/series. Keep it in debian/patches to help backports.

diff --git a/debian/changelog b/debian/changelog
index c66b0b296b41b2350107b30cfbe6832255f24ff5..36575cd4cb7d0008705e7eb9c31e0626b5c6a3f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ roundcube (0.2.1-2) UNRELEASED; urgency=low
   * Update debconf translations:
       + German, thanks to Helge Kreutzmann. Closes: #520004.
       + Japanese, thanks to Hideki Yamane. Closes: #520024.
+  * Depend on php-mdb2-* (>= 1.5.0b2) since it is needed to fix some
+    bugs. Closes: #519104, #519293. Remove not needed any more patch from
+    debian/patches/series. Keep it in debian/patches to help backports.
 
- -- Vincent Bernat <bernat@debian.org>  Mon, 23 Mar 2009 18:52:31 +0100
+ -- Vincent Bernat <bernat@debian.org>  Sat, 25 Apr 2009 17:40:45 +0200
 
 roundcube (0.2.1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index a7432002031b2078856b3dd3e43336c7d427e163..a67f432255dfe0be2632ff3fa84e7c31c204b08c 100644 (file)
--- 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-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-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1
 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 e148aedf8f1b79e4e3eecd3b3d625b0c80d368b6..853b6e7fee191d9d89d520694399db42a3122a12 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ dbconfig-common_support.patch
 correct_install_path.patch
 use_packaged_tinymce.patch
 correct-magic-path.patch
-too-old-mdb2.patch