[DRE-commits] [rails] 07/09: Fix upgrades from wheezy (hopefully, for good)

[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 e0a4be1aae721d8e9d251700e2030d8e381702cc
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 25 16:31:09 2014 -0200

    Fix upgrades from wheezy (hopefully, for good)
---
 debian/changelog | 10 +++++++---
 debian/control   | 20 ++++++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd0875c..14e83a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 rails (2:4.1.8-1) UNRELEASED; urgency=medium
 
   * New upstream release
-    - Includes only a fix for [CVE-2014-7818] (Arbitrary file existence
-      disclosure in Action Pack)
-  * Add Breaks: for all packages that we have in Replaces: (Closes: #768850)
+    - Includes only bug fixes and no behavior changes. In special, includes
+      fix for [CVE-2014-7818] and [CVE-2014-7829] (Arbitrary file existence
+      disclosure in Action Pack) (Closes: #770934)
+  * Add new transitional binary package ruby-activesupport-2.3 plus
+    appropriate Breaks:/Replaces: fieds in all binary packages to ensure
+    upgrades from wheezy work (Closes: #768850)
+    - Many thanks to Andreas Beckmann for helping debug the upgrade issue.
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 14 Nov 2014 16:03:52 -0200
 
diff --git a/debian/control b/debian/control
index f31aec1..6b2b799 100644
--- a/debian/control
+++ b/debian/control
@@ -28,13 +28,29 @@ Depends: ruby | ruby-interpreter,
          ruby-tzinfo (>= 1.1),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: ruby-activesupport-2.3, ruby-activesupport-3.2, ruby-activesupport-4.0
-Breaks: ruby-activesupport-2.3, ruby-activesupport-3.2, ruby-activesupport-4.0
+Replaces: ruby-activesupport-2.3 (<< 2:4), ruby-activesupport-3.2, ruby-activesupport-4.0
+Breaks: ruby-activesupport-2.3 (<< 2:4), ruby-activesupport-3.2, ruby-activesupport-4.0
 Description: Support and utility classes used by the Rails 4.1 framework
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be
  generally useful.
 
+Package: ruby-activesupport-2.3
+Architecture: all
+Depends: ruby-activesupport (>= 2:4),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks:
+ ruby-activesupport-3.2,
+ ruby-activesupport-4.0,
+ ruby-actionpack-2.3,
+ ruby-activerecord-2.3,
+ ruby-activeresource-2.3,
+ ruby-rails-2.3,
+Description: transitional dummy package
+ Ensure the removal of rails 2.3 on upgrades from wheezy.
+ This package can be safely removed.
+
 Package: ruby-activerecord
 Architecture: all
 X-DhRuby-Root: activerecord/

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