[DRE-commits] [rails] 15/16: ruby-rails: adjust conflicts/breaks

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails.

commit 05682248b0e34e317bcaabb406675ce8fd794859
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Aug 3 00:42:24 2014 -0300

    ruby-rails: adjust conflicts/breaks
---
 debian/changelog | 3 +++
 debian/control   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e59235..ca24c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ rails (2:4.1.4-4) unstable; urgency=medium
     - add Breaks/Replaces: rails3
     - bump Depends: ruby-sprockets-rails to (>= 2.1.3-1~)
     - add Depends: ruby-treetop
+    - move ruby-activesuppport-3.2 from Breaks: to Conflicts:
+    - remove Breaks: rails (<< 2:4.1) since we now also provide a
+      `rails`` binary
   * ruby-railties:
     - remove Breaks: rails (<< 3:3.2.0)
   * ruby-actionmailer:
diff --git a/debian/control b/debian/control
index 7362ee2..ee147c7 100644
--- a/debian/control
+++ b/debian/control
@@ -170,9 +170,9 @@ Recommends: ruby-coffee-rails,
             ruby-sqlite3,
             ruby-turbolinks,
             ruby-uglifier
-Breaks: ruby-activeresource-3.2, ruby-rails-2.3, ruby-rails-3.2, ruby-rails-4.0
+Conflicts: ruby-activeresource-3.2
+Breaks: ruby-rails-2.3, ruby-rails-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