[DRE-commits] [SCM] ruby-activerecord-3.2.git branch, master, updated. debian/3.2.3-2-2-g4724340

[Ondřej Surý]

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

    Add Conflicts with ruby-activerecord-2.3 (Closes: #673741, #673578)

diff --git a/debian/control b/debian/control
index 4c1cdf9..c220807 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Depends: ${shlibs:Depends},
 	 ruby-activemodel-3.2 (<< 3.2.3.),
 	 ruby-arel (>= 3.0.2~),
 	 ruby-tzinfo (>= 0.3.29~)
+Conflicts: ruby-activerecord-2.3
 Description: Object-relational mapper framework (part of Rails).
  Active Records is a framework to work with databases on Rails.  Build
  a persistent domain model by mapping database tables to Ruby classes.

-- 
ruby-activerecord-3.2.git