[DRE-commits] [rails] 42/44: Update patches for 4.1.4 release

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository rails.

commit 7748f3e2f6a57086ae7d98ada07c870d2513e4f7
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 15:28:55 2014 +0200

    Update patches for 4.1.4 release
---
 debian/patches/be-carefull-with-that-bundler.patch  | 21 +++++++++++----------
 ...na_lisa.jpg_is_PD-Art_and_has_been_removed.patch | 12 ++++++------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/patches/be-carefull-with-that-bundler.patch b/debian/patches/be-carefull-with-that-bundler.patch
index 1cbd402..16d6e50 100644
--- a/debian/patches/be-carefull-with-that-bundler.patch
+++ b/debian/patches/be-carefull-with-that-bundler.patch
@@ -13,11 +13,9 @@ Description: Be careful with that bundler
  This is patch is most probably Debian-specific.
 Author: Antonio Terceiro <terceiro at debian.org>
 
-Index: rails-4.0/railties/lib/rails/generators/app_base.rb
-===================================================================
---- rails-4.0.orig/railties/lib/rails/generators/app_base.rb	2014-01-16 16:39:12.293339784 +0100
-+++ rails-4.0/railties/lib/rails/generators/app_base.rb	2014-01-16 16:40:24.876899621 +0100
-@@ -265,16 +265,14 @@ module Rails
+--- rails.orig/railties/lib/rails/generators/app_base.rb
++++ rails/railties/lib/rails/generators/app_base.rb
+@@ -323,11 +323,9 @@ module Rails
          # We unset temporary bundler variables to load proper bundler and Gemfile.
          #
          # Thanks to James Tucker for the Gem tricks involved in this call.
@@ -25,14 +23,17 @@ Index: rails-4.0/railties/lib/rails/generators/app_base.rb
 -
          require 'bundler'
          Bundler.with_clean_env do
--          print `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
-+          print `"#{Gem.ruby}" "/usr/bin/bundle" #{command}`
+-          output = `"#{Gem.ruby}" "#{_bundle_command}" #{command}`
++          output = `"#{Gem.ruby}" "/usr/bin/bundle" #{command}`
+           print output unless options[:quiet]
          end
        end
+@@ -341,7 +339,7 @@ module Rails
+       end
  
        def run_bundle
--        bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
-+        bundle_command('install --local') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
+-        bundle_command('install') if bundle_install?
++        bundle_command('install --local') if bundle_install?
        end
  
-       def empty_directory_with_keep_file(destination, config = {})
+       def generate_spring_binstubs
diff --git a/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch b/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
index e39a3b0..fc69be5 100644
--- a/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
+++ b/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
@@ -1,6 +1,6 @@
---- rails-4.0.orig/actionpack/test/controller/test_case_test.rb
-+++ rails-4.0/actionpack/test/controller/test_case_test.rb
-@@ -780,80 +780,6 @@ XML
+--- rails.orig/actionpack/test/controller/test_case_test.rb
++++ rails/actionpack/test/controller/test_case_test.rb
+@@ -805,80 +805,6 @@ XML
    READ_BINARY = 'rb:binary'
    READ_PLAIN = 'r:binary'
  
@@ -81,9 +81,9 @@
    def test_test_uploaded_file_exception_when_file_doesnt_exist
      assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
    end
---- rails-4.0.orig/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
-+++ rails-4.0/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
-@@ -127,14 +127,6 @@ class MultipartParamsParsingTest < Actio
+--- rails.orig/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
++++ rails/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+@@ -126,14 +126,6 @@ class MultipartParamsParsingTest < Actio
      assert_equal "", params['files'].read
    end
  

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