[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-5-g7f1f228

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 84d7f61baeea43e98f21d3920dbc8d7e7eb290f9
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon May 14 12:30:38 2012 +0200

    Patch to disable bundler

diff --git a/debian/patches/2017_disable_bundler.patch b/debian/patches/2017_disable_bundler.patch
new file mode 100644
index 0000000..3855e80
--- /dev/null
+++ b/debian/patches/2017_disable_bundler.patch
@@ -0,0 +1,53 @@
+Description: Disable bundler, not needed in debian.
+Forwarded: not-needed
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2012-05-14
+--- a/config/boot.rb
++++ b/config/boot.rb
+@@ -43,7 +43,7 @@
+       load_initializer
+       Rails::Initializer.class_eval do
+         def load_gems
+-          @bundler_loaded ||= Bundler.require :default, Rails.env
++          # @bundler_loaded ||= Bundler.require :default, Rails.env
+         end
+       end
+       Rails::Initializer.run(:set_load_path)
+--- a/config/preinitializer.rb
++++ b/config/preinitializer.rb
+@@ -1,20 +1,20 @@
+ begin
+   require "rubygems"
+-  require "bundler"
+-rescue LoadError
+-  $stderr.puts "Redmine requires Bundler. Please install it with `gem install bundler`."
+-  exit 1
++#  require "bundler"
++#rescue LoadError
++#  $stderr.puts "Redmine requires Bundler. Please install it with `gem install bundler`."
++#  exit 1
+ end
+ 
+-if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.21")
+-  $stderr.puts "Redmine requires Bundler 1.0.21 (you're using #{Bundler::VERSION}).\nPlease install a newer version with `gem install bundler`."
+-  exit 1
+-end
++#if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("1.0.21")
++#  $stderr.puts "Redmine requires Bundler 1.0.21 (you're using #{Bundler::VERSION}).\nPlease install a newer version with `gem install bundler`."
++#  exit 1
++#end
+ 
+-begin
+-  ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+-  Bundler.setup
+-rescue Bundler::GemNotFound
+-  $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
+-  exit 1
+-end
++#begin
++#  ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
++#  Bundler.setup
++#rescue Bundler::GemNotFound
++#  $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
++#  exit 1
++#end

-- 
redmine.git