From: Vincent Bernat <bernat@luffy.cx>
Date: Sat, 5 Apr 2008 08:23:50 +0000 (+0000)
Subject: Depends on php-mail-mime (>= 1.5.0)
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec1d3321497094ee25fc55a43a6c3337b9aef417;p=roundcube.git

Depends on php-mail-mime (>= 1.5.0)
---

diff --git a/debian/changelog b/debian/changelog
index c1272ac..4f731e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ roundcube (0.1-5) unstable; urgency=low
 
   * Debconf translation updates:
     - Spanish. Closes: #473788
+  * Depends on php-mail-mime (>= 1.5.0) and drop compatibility patch.
 
- -- Vincent Bernat <bernat@luffy.cx>  Tue, 01 Apr 2008 19:23:58 +0200
+ -- Vincent Bernat <bernat@luffy.cx>  Sat, 05 Apr 2008 10:22:51 +0200
 
 roundcube (0.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fa128c6..cb1c41f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,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, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, tinymce, ${misc:Depends}, libmagic1
+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 (>= 1.5.0), ucf, tinymce, ${misc:Depends}, libmagic1
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers
diff --git a/debian/patches/fix-too-old-php-mail-mime.patch b/debian/patches/fix-too-old-php-mail-mime.patch
index d1af6b6..61ed729 100644
--- a/debian/patches/fix-too-old-php-mail-mime.patch
+++ b/debian/patches/fix-too-old-php-mail-mime.patch
@@ -1,3 +1,6 @@
+This patch is not used any more with php-mail-mime (>= 1.5.0).
+It is left here to help with backports. Add it back to series if needed.
+
 --- roundcube/program/steps/mail/sendmail.inc	2008-03-07 09:52:40.000000000 +0100
 +++ roundcube/program/steps/mail/sendmail.inc.new	2008-03-07 11:04:33.000000000 +0100
 @@ -351,7 +351,11 @@
diff --git a/debian/patches/series b/debian/patches/series
index e679d9a..c1aeafd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ use_packaged_tinymce.patch
 use-db-backend.patch
 correct-magic-path.patch
 disable-tinymce-spellchecker.patch
-fix-too-old-php-mail-mime.patch