[DRE-commits] [redmine] 01/03: Add Gemfile patch back to allow backporting redmine

[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 03717d79a064be7bb1b87a22214bc03944a06bb1
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Oct 24 08:55:39 2013 +0200

    Add Gemfile patch back to allow backporting redmine
---
 debian/patches/2017_Gemfile_debian.patch |   15 ++++++---------
 debian/patches/series                    |    1 +
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/patches/2017_Gemfile_debian.patch b/debian/patches/2017_Gemfile_debian.patch
index ccc71d3..57a67a0 100644
--- a/debian/patches/2017_Gemfile_debian.patch
+++ b/debian/patches/2017_Gemfile_debian.patch
@@ -1,16 +1,12 @@
-Description: Let redmine use bundler - but do not actually let it install gems.
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2012-05-14
---- a/Gemfile
-+++ b/Gemfile
-@@ -1,87 +1,5 @@
+--- redmine.orig/Gemfile
++++ redmine/Gemfile
+@@ -1,88 +1,5 @@
  source 'https://rubygems.org'
  
 -gem "rails", "3.2.13"
 -gem "jquery-rails", "~> 2.0.2"
 -gem "i18n", "~> 0.6.0"
--gem "coderay", "~> 1.0.6"
+-gem "coderay", "~> 1.0.9"
 -gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 -gem "builder", "3.0.0"
 -
@@ -21,7 +17,7 @@ Last-Update: 2012-05-14
 -
 -# Optional gem for OpenID authentication
 -group :openid do
--  gem "ruby-openid", "~> 2.1.4", :require => "openid"
+-  gem "ruby-openid", "~> 2.2.3", :require => "openid"
 -  gem "rack-openid"
 -end
 -
@@ -87,6 +83,7 @@ Last-Update: 2012-05-14
 -  gem "shoulda", "~> 3.3.2"
 -  gem "mocha", "~> 0.13.3"
 -  gem 'capybara', '~> 2.0.0'
+-  gem 'nokogiri', '< 1.6.0'
 -end
 -
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
diff --git a/debian/patches/series b/debian/patches/series
index 5f5ada5..16d6b74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 2009_FHS_thin_config.patch
 2018_get_rid_of_rdoctask.patch
 2019_unplug_bundler.patch
+2017_Gemfile_debian.patch

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