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

[Ondřej Surý]

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

    Add Conflict with ruby-actionpack-2.3 (Closes: #673737)

diff --git a/debian/control b/debian/control
index 0576b4d..012bc3a 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends: ${shlibs:Depends},
 	 ruby-builder (>= 3.0.0),
 	 ruby-erubis (>= 2.7.0~),
 	 ruby-tzinfo (>= 0.3.29~)
+Conflicts: ruby-actionpack-2.3
 Description: Web-flow and rendering framework putting the VC in MVC (part of Rails).
  Action Pack is a framework for web apps on Rails. Simple,
  battle-tested conventions for building and testing MVC web

-- 
ruby-actionpack-3.2.git