[DRE-commits] [SCM] rails-4.0.git branch, master, updated. debian/4.0.0_rc1-1-18-gbcd6e5c

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 0918f6c30c2e07c140037537bb5a9fe00ff537ec
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 14:08:06 2013 +0200

    Weaken some Conflicts to Breaks

diff --git a/debian/control b/debian/control
index e54797d..1fa58b0 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,8 @@ Depends: ${shlibs:Depends},
 	 ruby-minitest (>= 4.2),
 	 ruby-thread-safe (>= 0.1)
 Provides: ruby-activesupport
-Conflicts: ruby-activesupport, ruby-activesupport-2.3, ruby-activesupport-3.2
+Conflicts: ruby-activesupport
+Breaks: ruby-activesupport-2.3, ruby-activesupport-3.2
 Replaces: ruby-activesupport, ruby-activesupport-2.3, ruby-activesupport-3.2
 Description: Support and utility classes used by the Rails 4.0 framework
  ActiveSupport consists of utility classes and extensions to the Ruby
@@ -42,8 +43,9 @@ Depends: ${misc:Depends},
 	 ruby-activemodel-4.0 (= ${source:Version}),
 	 ruby-activerecord-deprecated-finders (>= 1.0.2),
 	 ruby-arel (>= 4.0.0)
-Provides: ruby-activerecord,
-Conflicts: ruby-activerecord, ruby-activerecord-2.3, ruby-activerecord-3.2
+Provides: ruby-activerecord
+Conflicts: ruby-activerecord
+Breaks: ruby-activerecord-2.3, ruby-activerecord-3.2
 Replaces: ruby-activerecord, ruby-activerecord-2.3, ruby-activerecord-3.2
 Description: object-relational mapper framework (part of Rails)
  Active Records is a framework to work with databases on Rails.  Build
@@ -61,7 +63,8 @@ Depends: ${misc:Depends},
 	 ruby-bcrypt (>= 3.0.0),
 	 ruby-activesupport-4.0 (= ${source:Version})
 Provides: ruby-activemodel
-Conflicts: ruby-activemodel, ruby-activemodel-3.2
+Conflicts: ruby-activemodel
+Breaks: ruby-activemodel-3.2
 Replaces: ruby-activemodel, ruby-activemodel-3.2
 Description: toolkit for building modeling frameworks (part of Rails)
  Active Model is a toolkit for building modeling frameworks like
@@ -81,7 +84,8 @@ Depends: ${misc:Depends},
 	 ruby-builder (>= 3.1.0),
 	 ruby-erubis (>= 2.7.0~)
 Provides: ruby-actionpack
-Conflicts: ruby-actionpack, ruby-actionpack-2.3, ruby-actionpack-3.2
+Conflicts: ruby-actionpack
+Breaks: ruby-actionpack-2.3, ruby-actionpack-3.2
 Replaces: ruby-actionpack, ruby-actionpack-2.3, ruby-actionpack-3.2
 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,
@@ -98,7 +102,7 @@ Depends: ${shlibs:Depends},
 	 ruby-actionpack-4.0 (= ${source:Version}),
 	 ruby-mail (>= 2.5.3~)
 Provides: ruby-actionmailer
-Conflicts: ruby-actionmailer, ruby-actionmailer-2.3, ruby-actionmailer-3.2
+Breaks: ruby-actionmailer, ruby-actionmailer-2.3, ruby-actionmailer-3.2
 Replaces: ruby-actionmailer, ruby-actionmailer-2.3, ruby-actionmailer-3.2
 Description: email composition, delivery, and receiving framework (part of Rails)
  Action Mailer is a framework for working with email on Rails.
@@ -118,7 +122,8 @@ Depends: ${misc:Depends},
 	 ruby-activesupport-4.0 (= ${source:Version}),
 	 ruby-actionpack-4.0 (= ${source:Version})
 Provides: ruby-railties
-Conflicts: ruby-railties, ruby-rails-2.3, ruby-railties-3.2, rails (<< 3:3.2.0), rails3
+Conflicts: ruby-railties
+Breaks: ruby-rails-2.3, ruby-railties-3.2, rails (<< 3:3.2.0), rails3
 Replaces: ruby-railties, ruby-rails-2.3, ruby-railties-3.2
 Description: MVC ruby based framework geared for web application development
  Rails is a full-stack, open-source web framework in Ruby for writing
@@ -144,7 +149,8 @@ Depends: ${shlibs:Depends},
 	 ruby-sprockets-rails (>= 2.0.0~rc4),
 	 libjs-jquery
 Provides: ruby-rails
-Conflicts: ruby-rails, ruby-rails-2.3, ruby-rails-3.2, ruby-activeresource-3.2
+Conflicts: ruby-rails
+Breaks: ruby-rails-2.3, ruby-rails-3.2, ruby-activeresource-3.2
 Replaces: ruby-rails, ruby-rails-2.3, ruby-rails-3.2
 Description: MVC ruby based framework geared for web application development
  Rails is a full-stack, open-source web framework in Ruby for writing

-- 
rails-4.0.git