[DRE-commits] [SCM] ruby-actionmailer-3.2.git branch, master, updated. debian/3.2.3-1-2-g4e7c84e

[Ondřej Surý]

The following commit has been merged in the master branch:
commit aa1215efe892354fd7d2f26125c5ce758d3e2c5b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 23 13:01:12 2012 +0200

    Add Conflict with ruby-actionmailer-2.3 (Closes: #673740)

diff --git a/debian/control b/debian/control
index 8a15a54..4ed56e3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends: ${shlibs:Depends},
 	 ruby-actionpack-3.2 (>= 3.2.3),
 	 ruby-actionpack-3.2 (<< 3.2.3.1),
 	 ruby-mail (>= 2.4.4~)
+Conflicts: ruby-actionmailer-2.3
 Description: Email composition, delivery, and receiving framework (part of Rails).
  Action Mailer is a framework for working with email on Rails.
  Compose, deliver, receive, and test emails using the familiar

-- 
ruby-actionmailer-3.2.git