[DRE-commits] [redmine] 02/04: drop patch that removes Bundler setup phase.

[Antonio Terceiro]

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

terceiro pushed a commit to branch master-wheezy-backports
in repository redmine.

commit 57b022abb85519496f82d0a14116a7d6ee890c21
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Nov 10 19:35:14 2014 -0200

    drop patch that removes Bundler setup phase.
---
 debian/changelog                         |  1 +
 debian/patches/2019_unplug_bundler.patch | 56 --------------------------------
 debian/patches/series                    |  1 -
 3 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0dbf316..a3a52c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ redmine (2.5.1-2~bpo70+4) UNRELEASED; urgency=medium
 
   * revert to installing Gemfile. Without a Gemfile it might be
     hard/impossible to use some plugins
+    - also drop patch that removes Bundler setup phase.
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 10 Nov 2014 19:32:16 -0200
 
diff --git a/debian/patches/2019_unplug_bundler.patch b/debian/patches/2019_unplug_bundler.patch
deleted file mode 100644
index ca18fe8..0000000
--- a/debian/patches/2019_unplug_bundler.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: redmine package shouldn't need bundler to run
- bundler is a development tool
-Forwarded: not-needed, i'm not ruby expert enough to convince upstream about changing that
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2013-09-28
---- redmine.orig/config/boot.rb
-+++ redmine/config/boot.rb
-@@ -3,4 +3,6 @@ require 'rubygems'
- # Set up gems listed in the Gemfile.
- ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
- 
--require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-+# disable bundler setup
-+# require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-+
---- redmine.orig/config/preinitializer.rb
-+++ redmine/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
--end
-+#begin
-+#  require "rubygems"
-+#  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
diff --git a/debian/patches/series b/debian/patches/series
index 193a8c0..ff1290d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 2008_force_table_encoding_mysql.patch
 2009_FHS_thin_config.patch
 2018_get_rid_of_rdoctask.patch
-2019_unplug_bundler.patch
 2017_Gemfile_debian.patch
 1001_Parsedate.parsedate.patch
 2020_load_awesome_nested_set.patch

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