[DRE-commits] [redmine] 02/03: Refresh patches for 2.4.1 release

[Ondrej Sury]

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

ondrej pushed a commit to branch master-experimental
in repository redmine.

commit e873c5eab546a9a3b65d7a34e699b3e85a08d21c
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Dec 3 12:03:30 2013 +0100

    Refresh patches for 2.4.1 release
---
 debian/patches/2017_Gemfile_debian.patch | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index 57a67a0..51555a6 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -1,12 +1,11 @@
 --- redmine.orig/Gemfile
 +++ redmine/Gemfile
-@@ -1,88 +1,5 @@
+@@ -1,90 +1,5 @@
  source 'https://rubygems.org'
  
--gem "rails", "3.2.13"
+-gem "rails", "3.2.15"
 -gem "jquery-rails", "~> 2.0.2"
--gem "i18n", "~> 0.6.0"
--gem "coderay", "~> 1.0.9"
+-gem "coderay", "~> 1.1.0"
 -gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 -gem "builder", "3.0.0"
 -
@@ -17,7 +16,7 @@
 -
 -# Optional gem for OpenID authentication
 -group :openid do
--  gem "ruby-openid", "~> 2.2.3", :require => "openid"
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
 -  gem "rack-openid"
 -end
 -
@@ -34,7 +33,7 @@
 -platforms :jruby do
 -  # jruby-openssl is bundled with JRuby 1.7.0
 -  gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
--  gem "activerecord-jdbc-adapter", "1.2.5"
+-  gem "activerecord-jdbc-adapter", "~> 1.3.2"
 -end
 -
 -# Include database gems for the adapters found in the database
@@ -81,9 +80,12 @@
 -
 -group :test do
 -  gem "shoulda", "~> 3.3.2"
--  gem "mocha", "~> 0.13.3"
--  gem 'capybara', '~> 2.0.0'
--  gem 'nokogiri', '< 1.6.0'
+-  gem "mocha", ">= 0.14", :require => 'mocha/api'
+-  if RUBY_VERSION >= '1.9.3'
+-    gem "capybara", "~> 2.1.0"
+-    gem "selenium-webdriver"
+-    gem "database_cleaner"
+-  end
 -end
 -
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")

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