[DRE-commits] [redmine] 08/26: Gemfile: make adjustments to version expectations

[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 88bfb7a02c518ee3b100f3b29e3fb776b554371c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 29 00:32:47 2014 -0700

    Gemfile: make adjustments to version expectations
---
 debian/changelog                         |  2 ++
 debian/patches/gemfile-adjustments.patch | 47 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 972b6b1..5f2d8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ redmine (3.0~20140825-1) UNRELEASED; urgency=medium
   * Drop debian/patches/2019_unplug_bundler.patch: bundler is too much
     intricated into Rails nowadays for us to be able to run without it.
   * debian/rules: stop messing with the Gemfile
+  * debian/patches/gemfile-adjustments.patch: make adjustments to version
+    expectations; some of them are too strict
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 25 Aug 2014 21:04:18 -0300
 
diff --git a/debian/patches/gemfile-adjustments.patch b/debian/patches/gemfile-adjustments.patch
new file mode 100644
index 0000000..6d801ab
--- /dev/null
+++ b/debian/patches/gemfile-adjustments.patch
@@ -0,0 +1,47 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -1,10 +1,10 @@
+ source 'https://rubygems.org'
+ 
+-gem "rails", "4.1.4"
++gem "rails", "~> 4.1.4"
+ gem "jquery-rails", "~> 3.1.1"
+ gem "coderay", "~> 1.1.0"
+ gem "builder", ">= 3.0.4"
+-gem "request_store", "1.0.5"
++gem "request_store", ">= 1.0.5"
+ gem "mime-types"
+ gem "awesome_nested_set", ">= 3.0.0.rc.6"
+ gem "protected_attributes"
+@@ -15,12 +15,12 @@ gem 'tzinfo-data', platforms: [:mingw, :
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.3.1"
++  gem "net-ldap", ">= 0.3.1"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", ">= 2.3.0", :require => "openid"
+   gem "rack-openid"
+ end
+ 
+@@ -83,16 +83,6 @@ group :development do
+   gem "yard"
+ end
+ 
+-group :test do
+-  gem "minitest"
+-  gem "shoulda"
+-  gem "shoulda-context"
+-  gem "mocha", :require => 'mocha/api'
+-  # For running UI tests
+-  gem "capybara", "~> 2.1.0"
+-  gem "selenium-webdriver"
+-end
+-
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exists?(local_gemfile)
+   eval_gemfile local_gemfile
diff --git a/debian/patches/series b/debian/patches/series
index ea0c239..b156ff5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 2018_get_rid_of_rdoctask.patch
 1001_Parsedate.parsedate.patch
 2020_load_awesome_nested_set.patch
+gemfile-adjustments.patch

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