[DRE-commits] [ruby-railties-3.2] 05/07: Update patches for 3.2.16 release

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository ruby-railties-3.2.

commit 953de408c1cc725370184ecf96746c93e35fafcb
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Dec 5 11:12:21 2013 +0100

    Update patches for 3.2.16 release
---
 debian/patches/be-carefull-with-that-bundler.patch |  4 ++--
 debian/patches/fix-rake-tmp-tasks.patch            |  4 ++--
 debian/patches/remove-rubygems.patch               | 21 ++++++++++-----------
 debian/patches/syntaxhighlighter-source.patch      |  6 +++---
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/debian/patches/be-carefull-with-that-bundler.patch b/debian/patches/be-carefull-with-that-bundler.patch
index 2d8ee0e..b662a71 100644
--- a/debian/patches/be-carefull-with-that-bundler.patch
+++ b/debian/patches/be-carefull-with-that-bundler.patch
@@ -13,8 +13,8 @@ Description: Be careful with that bundler
  This is patch is most probably Debian-specific.
 Author: Antonio Terceiro <terceiro at debian.org>
 
---- ruby-railties-3.2-3.2.6.orig/lib/rails/generators/app_base.rb
-+++ ruby-railties-3.2-3.2.6/lib/rails/generators/app_base.rb
+--- ruby-railties-3.2.orig/lib/rails/generators/app_base.rb
++++ ruby-railties-3.2/lib/rails/generators/app_base.rb
 @@ -241,21 +241,11 @@ module Rails
        def bundle_command(command)
          say_status :run, "bundle #{command}"
diff --git a/debian/patches/fix-rake-tmp-tasks.patch b/debian/patches/fix-rake-tmp-tasks.patch
index e1b107c..09f5f4f 100644
--- a/debian/patches/fix-rake-tmp-tasks.patch
+++ b/debian/patches/fix-rake-tmp-tasks.patch
@@ -1,5 +1,5 @@
---- a/lib/rails/tasks/tmp.rake
-+++ b/lib/rails/tasks/tmp.rake
+--- ruby-railties-3.2.orig/lib/rails/tasks/tmp.rake
++++ ruby-railties-3.2/lib/rails/tasks/tmp.rake
 @@ -4,34 +4,38 @@ namespace :tmp do
  
    desc "Creates tmp directories for sessions, cache, sockets, and pids"
diff --git a/debian/patches/remove-rubygems.patch b/debian/patches/remove-rubygems.patch
index f5becb4..9119429 100644
--- a/debian/patches/remove-rubygems.patch
+++ b/debian/patches/remove-rubygems.patch
@@ -1,6 +1,6 @@
---- a/guides/rails_guides.rb
-+++ b/guides/rails_guides.rb
-@@ -9,33 +9,17 @@ def bundler?
+--- ruby-railties-3.2.orig/guides/rails_guides.rb
++++ ruby-railties-3.2/guides/rails_guides.rb
+@@ -9,19 +9,7 @@ def bundler?
  end
  
  # Loading Action Pack requires rack and erubis.
@@ -21,8 +21,7 @@
  
  begin
    require 'redcloth'
--rescue Gem::LoadError
-+rescue LoadError
+@@ -29,13 +17,9 @@ rescue LoadError
    # This can happen if doc:guides is executed in an application.
    $stderr.puts('Generating guides requires RedCloth 4.1.1+.')
    $stderr.puts(<<ERROR) if bundler?
@@ -38,8 +37,8 @@
  
  and try again.
  ERROR
---- a/guides/w3c_validator.rb
-+++ b/guides/w3c_validator.rb
+--- ruby-railties-3.2.orig/guides/w3c_validator.rb
++++ ruby-railties-3.2/guides/w3c_validator.rb
 @@ -26,7 +26,6 @@
  #
  # ---------------------------------------------------------------------------
@@ -48,8 +47,8 @@
  require 'w3c_validators'
  include W3CValidators
  
---- a/lib/rails/commands/application.rb
-+++ b/lib/rails/commands/application.rb
+--- ruby-railties-3.2.orig/lib/rails/commands/application.rb
++++ ruby-railties-3.2/lib/rails/commands/application.rb
 @@ -19,7 +19,6 @@ else
    end
  end
@@ -58,8 +57,8 @@
  require 'rails/generators'
  require 'rails/generators/rails/app/app_generator'
  
---- a/lib/rails/commands/plugin_new.rb
-+++ b/lib/rails/commands/plugin_new.rb
+--- ruby-railties-3.2.orig/lib/rails/commands/plugin_new.rb
++++ ruby-railties-3.2/lib/rails/commands/plugin_new.rb
 @@ -1,5 +1,3 @@
 -require 'rubygems' if ARGV.include?("--dev")
 -
diff --git a/debian/patches/syntaxhighlighter-source.patch b/debian/patches/syntaxhighlighter-source.patch
index 50dbd9c..6bb4c41 100644
--- a/debian/patches/syntaxhighlighter-source.patch
+++ b/debian/patches/syntaxhighlighter-source.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/guides/assets/javascripts/syntaxhighlighter/src/shAutoloader.js
++++ ruby-railties-3.2/guides/assets/javascripts/syntaxhighlighter/src/shAutoloader.js
 @@ -0,0 +1,130 @@
 +/**
 + * SyntaxHighlighter
@@ -132,7 +132,7 @@
 +
 +})();
 --- /dev/null
-+++ b/guides/assets/javascripts/syntaxhighlighter/src/shCore.js
++++ ruby-railties-3.2/guides/assets/javascripts/syntaxhighlighter/src/shCore.js
 @@ -0,0 +1,1721 @@
 +/**
 + * SyntaxHighlighter
@@ -1856,7 +1856,7 @@
 +// CommonJS
 +typeof(exports) != 'undefined' ? exports['SyntaxHighlighter'] = SyntaxHighlighter : null;
 --- /dev/null
-+++ b/guides/assets/javascripts/syntaxhighlighter/src/shLegacy.js
++++ ruby-railties-3.2/guides/assets/javascripts/syntaxhighlighter/src/shLegacy.js
 @@ -0,0 +1,157 @@
 +/**
 + * SyntaxHighlighter

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