[DRE-commits] [SCM] ruby-activeresource-3.2.git branch, master, updated. upstream/3.2.3-4-gec0d9a0

[Ondřej Surý]

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

    Add Conflict with ruby-activeresource-3.2 (Closes: #673742)

diff --git a/debian/control b/debian/control
index 1732cfc..d9f2502 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Depends: ${shlibs:Depends},
 	 ruby-activesupport-3.2 (<< 3.2.3.),
 	 ruby-activemodel-3.2 (>= 3.2.3),
 	 ruby-activemodel-3.2 (<< 3.2.3.)
+Conflicts: ruby-activeresource-2.3
 Description: REST modeling framework (part of Rails).
  Active Resource (ARes) connects business objects and Representational
  State Transfer (REST) web services.  It implements object-relational

-- 
ruby-activeresource-3.2.git