[DRE-commits] [rails-3.2] 04/11: Remove unecessary patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails-3.2.

commit 89cef4aa6c8acbe6c0f32bd3c127107ec5ab1ac4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Dec 14 14:09:47 2013 -0300

    Remove unecessary patches
---
 debian/patches/rack-1.5.patch                    | 37 ------------------------
 debian/patches/remove-rubygems-requirement.patch | 17 -----------
 debian/patches/series                            |  2 --
 3 files changed, 56 deletions(-)

diff --git a/debian/patches/rack-1.5.patch b/debian/patches/rack-1.5.patch
deleted file mode 100644
index fb92b66..0000000
--- a/debian/patches/rack-1.5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: fix test session code to work with Rack 1.5
-Author: Carlos Antonio da Silva + Santiago Pastorino
-Reviewed-By: Antonio Terceiro <terceiro at debian.org>
-Comment:
- This patch is based on the upstream commit by Carlos Antonio da Silva that
- migrated Rails 4.0 to Rack 1.5:
- https://github.com/rails/rails/commit/7d624e0e8cfa3adffd8f475e3588d83f3b367c24
-
-
---- rails-3.2.orig/actionpack/lib/action_controller/test_case.rb
-+++ rails-3.2/actionpack/lib/action_controller/test_case.rb
-@@ -240,13 +240,24 @@ module ActionController
- 
-     def initialize(session = {})
-       super(nil, nil)
--      replace(session.stringify_keys)
-+      @id = SecureRandom.hex(16)
-+      @data = stringify_keys(session)
-       @loaded = true
-     end
- 
-     def exists?
-       true
-     end
-+
-+    def destroy
-+      clear
-+    end
-+
-+    private
-+
-+      def load!
-+        @id
-+      end
-   end
- 
-   # Superclass for ActionController functional tests. Functional tests allow you to
diff --git a/debian/patches/remove-rubygems-requirement.patch b/debian/patches/remove-rubygems-requirement.patch
deleted file mode 100644
index 6252d8f..0000000
--- a/debian/patches/remove-rubygems-requirement.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Remove Rubygems requirement
- Remove the requirement to have the bcrypt library installed via Rubygems. As
- long as it is installed, it should work.
-Author: Antonio Terceiro <terceiro at debian.org>
-
----
-
---- rails-3.2.orig/activemodel/lib/active_model/secure_password.rb
-+++ rails-3.2/activemodel/lib/active_model/secure_password.rb
-@@ -34,7 +34,6 @@ module ActiveModel
-       def has_secure_password
-         # Load bcrypt-ruby only when has_secure_password is used.
-         # This is to avoid ActiveModel (and by extension the entire framework) being dependent on a binary library.
--        gem 'bcrypt-ruby', '~> 3.0.0'
-         require 'bcrypt'
- 
-         attr_reader :password
diff --git a/debian/patches/series b/debian/patches/series
index 85c930d..d3b3b4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-rack-1.5.patch
 port-to-minitest.patch
-remove-rubygems-requirement.patch
 Remove_rubygems_dependency.patch

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