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

[Ondřej Surý]

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

    Add Conflicts with ruby-activesupport-2.3 (Closes: #673577)

diff --git a/debian/control b/debian/control
index 59e09fa..cee36c8 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Depends: ${shlibs:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-i18n (>= 0.6~),
 	 ruby-multi-json (>= 1.0~)
+Conflicts: ruby-activesupport-2.3
 Description: Support and utility classes used by the Rails 2.3 framework
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be

-- 
ruby-activesupport-3.2.git