[DRE-commits] [rails] 06/16: remove Breaks: rails (<< 3:3.2.0) from ruby-railties

[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 eb3c60a58c2960bdefa51a376d779a6ee7e2f187
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 27 11:13:31 2014 -0300

    remove Breaks: rails (<< 3:3.2.0) from ruby-railties
---
 debian/changelog | 21 +++++++++++----------
 debian/control   |  4 +++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44e0c2f..d0176cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-rails (2:4.1.4-4~2) UNRELEASED; urgency=medium
-
-  * ruby-rails: add Recommends:
-    - ruby-jquery-rails
-    - ruby-coffee-rails
-    - ruby-sqlite3
-    - ruby-sass-rails
-    - ruby-uglifier
+rails (2:4.1.4-4~3) UNRELEASED; urgency=medium
+
+  * ruby-rails:
+    - add Recommends:
+      - ruby-jquery-rails
+      - ruby-coffee-rails
+      - ruby-sqlite3
+      - ruby-sass-rails
+      - ruby-uglifier
+    - add Breaks/Replaces: rails3
   * ruby-railties:
-    - fix Breaks: on rails (<< 3:3.2.0); the correct is 2:3.2.0
-      (note the epoch)
+    - remove Breaks: rails (<< 3:3.2.0)
     - add Depends: ruby-spring
   * ruby-actionmailer:
     - drop Depends: ruby-mail (<< 2.6)
diff --git a/debian/control b/debian/control
index 5d90176..964edac 100644
--- a/debian/control
+++ b/debian/control
@@ -140,7 +140,7 @@ Depends: ${misc:Depends},
 	 ruby-activesupport (= ${source:Version}),
 	 ruby-actionpack (= ${source:Version}),
 	 ruby-spring,
-Breaks: ruby-rails-2.3, ruby-railties-3.2, rails (<< 2:3.2.0), rails3, ruby-railties-4.0
+Breaks: ruby-rails-2.3, ruby-railties-3.2, ruby-railties-4.0
 Replaces: ruby-rails-2.3, ruby-railties-3.2, ruby-railties-4.0
 Description: tools for creating, working with, and running Rails applications
  This package contains the Rails internals, i.e. components that implement
@@ -186,6 +186,8 @@ Architecture: all
 Depends:
 	 ruby-rails (= ${source:Version}),
 	 ${misc:Depends},
+Breaks: rails3
+Replaces: rails3
 Description: MVC ruby based framework geared for web application development (metapackage)
  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