[DRE-commits] [SCM] redmine.git branch, master, updated. debian/1.3.3+dfsg1-2-42-gede3bc9

[Jérémy Lal]

The following commit has been merged in the master branch:
commit d98e97087ea4ee6c968b6e27db6cbdd9cf72ebc7
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue May 15 00:42:09 2012 +0200

    Delete 2017_disable_bundler.patch

diff --git a/debian/patches/2017_disable_bundler.patch b/debian/patches/2017_disable_bundler.patch
deleted file mode 100644
index 3855e80..0000000
--- a/debian/patches/2017_disable_bundler.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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