[DRE-commits] [rails] 41/44: Add conflict with old rails package

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository rails.

commit 07795dba7a856acdcf056749930c30ae5e8d4eab
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 15:22:21 2014 +0200

    Add conflict with old rails package
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index de4f8a9..b32f136 100644
--- a/debian/control
+++ b/debian/control
@@ -169,6 +169,7 @@ Depends: ${shlibs:Depends},
 	 ruby-sprockets-rails (<< 3.0)
 Breaks: ruby-rails-2.3, ruby-rails-3.2, ruby-activeresource-3.2, ruby-rails-4.0
 Replaces: ruby-rails-2.3, ruby-rails-3.2, ruby-rails-4.0
+Conflicts: rails (<< 2:4.1)
 Description: MVC ruby based framework geared for web application development
  Rails is a full-stack, open-source web framework in Ruby for writing
  real-world applications.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git