[DRE-commits] [redmine] 06/26: Drop debian/patches/2019_unplug_bundler.patch

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit a245066ab5c753aa2907b6f093443c7e4a722705
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Aug 28 23:56:38 2014 -0700

    Drop debian/patches/2019_unplug_bundler.patch
---
 debian/changelog                         |  2 ++
 debian/patches/2019_unplug_bundler.patch | 26 --------------------------
 debian/patches/series                    |  1 -
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b9d481..bf8ff9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ redmine (3.0~20140825-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
   * Changes dependency from ruby-railties-3.2 to ruby-railties
+  * Drop debian/patches/2019_unplug_bundler.patch: bundler is too much
+    intricated into Rails nowadays for us to be able to run without it.
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 25 Aug 2014 21:04:18 -0300
 
diff --git a/debian/patches/2019_unplug_bundler.patch b/debian/patches/2019_unplug_bundler.patch
deleted file mode 100644
index 0739028..0000000
--- a/debian/patches/2019_unplug_bundler.patch
+++ /dev/null
@@ -1,26 +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
---- a/config/boot.rb
-+++ b/config/boot.rb
-@@ -1,4 +1,6 @@
- # 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'])
-+
---- a/config/application.rb
-+++ b/config/application.rb
-@@ -14,7 +14,7 @@ ENV['RAILS_LOG'] ||= "/var/log/redmine/#
- ENV['RAILS_VAR'] ||= "/var/lib/redmine/#{ENV['X_DEBIAN_SITEID']}"
- ENV['RAILS_TMP'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
- 
--Bundler.require(*Rails.groups)
-+# Bundler.require(*Rails.groups)
- 
- module RedmineApp
-   class Application < Rails::Application
diff --git a/debian/patches/series b/debian/patches/series
index 535c923..ea0c239 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@
 2008_force_table_encoding_mysql.patch
 2009_FHS_thin_config.patch
 2018_get_rid_of_rdoctask.patch
-2019_unplug_bundler.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