[DRE-commits] [ruby-railties-3.2] 01/02: Fix invalid conflict with rails (<< 3:3.2.0) (Closes: #731888)

[Ondrej Sury]

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

ondrej pushed a commit to annotated tag debian/3.2.16-2
in repository ruby-railties-3.2.

commit 6ee15e7d254470c022c1a93f2477d61ccc534fbc
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Dec 15 16:34:25 2013 +0100

    Fix invalid conflict with rails (<< 3:3.2.0) (Closes: #731888)
---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6abff53..0bb52b8 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-3.2 (>= 3.2.16),
 	 ruby-activemodel-3.2 (>= 3.2.16),
 	 ruby-activeresource-3.2 (>= 3.2.16)
-Conflicts: ruby-rails-2.3, rails (<< 3:3.2.0)
+Conflicts: ruby-rails-2.3, rails (<< 2:3.2.0)
 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.
diff --git a/debian/control.in b/debian/control.in
index f708322..b0989dd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -28,7 +28,7 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-3.2 (>= @RAILS_VERSION@),
 	 ruby-activemodel-3.2 (>= @RAILS_VERSION@),
 	 ruby-activeresource-3.2 (>= @RAILS_VERSION@)
-Conflicts: ruby-rails-2.3, rails (<< 3:3.2.0)
+Conflicts: ruby-rails-2.3, rails (<< 2:3.2.0)
 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/ruby-railties-3.2.git