[DRE-commits] [redmine] 02/06: Refresh patches for 2.5.1 release

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository redmine.

commit 72f85183f01543f79a6dd5dce183f5c9751c0f1a
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Apr 29 09:41:45 2014 +0200

    Refresh patches for 2.5.1 release
---
 debian/patches/2002_FHS_through_env_vars.patch |  2 +-
 debian/patches/2017_Gemfile_debian.patch       | 22 ++++++++++++++++------
 debian/patches/2019_unplug_bundler.patch       | 25 -------------------------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 1280ec0..a9385f6 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -105,7 +105,7 @@ Last-Update: 2013-09-28
  	
 --- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb
 +++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb
-@@ -221,7 +221,7 @@ module Redmine
+@@ -222,7 +222,7 @@ module Redmine
            if @stderr_log_file.nil?
              writable = false
              path = Redmine::Configuration['scm_stderr_log_file'].presence
diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index 0bc8377..447042d 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -1,13 +1,18 @@
---- redmine.orig/Gemfile
-+++ redmine/Gemfile
-@@ -1,90 +1,5 @@
+diff --git a/Gemfile b/Gemfile
+index 13915c6..9bd2fc2 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -1,98 +1,5 @@
  source 'https://rubygems.org'
  
--gem "rails", "3.2.16"
+-gem "rails", "3.2.17"
+-gem "rake", "~> 10.1.1"
 -gem "jquery-rails", "~> 2.0.2"
 -gem "coderay", "~> 1.1.0"
 -gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 -gem "builder", "3.0.0"
+-gem "mime-types"
+-gem "awesome_nested_set", "2.1.6"
 -
 -# Optional gem for LDAP authentication
 -group :ldap do
@@ -20,14 +25,20 @@
 -  gem "rack-openid"
 -end
 -
--# Optional gem for exporting the gantt to a PNG file, not supported with jruby
 -platforms :mri, :mingw do
+-  # Optional gem for exporting the gantt to a PNG file, not supported with jruby
 -  group :rmagick do
 -    # RMagick 2 supports ruby 1.9
 -    # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
 -    # different requirements for the same gem on different platforms
 -    gem "rmagick", ">= 2.0.0"
 -  end
+-
+-  # Optional Markdown support, not for JRuby
+-  group :markdown do
+-    # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
+-    gem "redcarpet", "~> 2.3.0"
+-  end
 -end
 -
 -platforms :jruby do
@@ -84,7 +95,6 @@
 -  if RUBY_VERSION >= '1.9.3'
 -    gem "capybara", "~> 2.1.0"
 -    gem "selenium-webdriver"
--    gem "database_cleaner"
 -  end
 -end
 -
diff --git a/debian/patches/2019_unplug_bundler.patch b/debian/patches/2019_unplug_bundler.patch
index 43bcae7..ca18fe8 100644
--- a/debian/patches/2019_unplug_bundler.patch
+++ b/debian/patches/2019_unplug_bundler.patch
@@ -54,28 +54,3 @@ Last-Update: 2013-09-28
 +#  $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
 +#  exit 1
 +#end
---- redmine.orig/lib/plugins/awesome_nested_set/Rakefile
-+++ redmine/lib/plugins/awesome_nested_set/Rakefile
-@@ -1,7 +1,7 @@
- # -*- encoding: utf-8 -*-
- $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
--require 'rubygems'
--require 'bundler/setup'
-+#require 'rubygems'
-+#require 'bundler/setup'
- require 'awesome_nested_set/version'
- 
- require "rspec/core/rake_task"
---- redmine.orig/lib/plugins/awesome_nested_set/spec/spec_helper.rb
-+++ redmine/lib/plugins/awesome_nested_set/spec/spec_helper.rb
-@@ -1,8 +1,8 @@
- $:.unshift(File.dirname(__FILE__) + '/../lib')
- plugin_test_dir = File.dirname(__FILE__)
- 
--require 'rubygems'
--require 'bundler/setup'
-+#require 'rubygems'
-+#require 'bundler/setup'
- 
- require 'rspec'
- require 'logger'

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