[DRE-commits] [rails] 34/44: Relax dependencies

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository rails.

commit 0f6626c31a577b2fe26d2ad4621e18eb095add76
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Jan 16 12:54:06 2014 +0100

    Relax dependencies
    
    Needed to satisfy those dependencies with versions available in Debian.
---
 debian/patches/relax-dependencies | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/relax-dependencies b/debian/patches/relax-dependencies
new file mode 100644
index 0000000..1033b7f
--- /dev/null
+++ b/debian/patches/relax-dependencies
@@ -0,0 +1,38 @@
+Index: rails-4.0/activesupport/activesupport.gemspec
+===================================================================
+--- rails-4.0.orig/activesupport/activesupport.gemspec	2014-01-16 14:15:03.177738377 +0100
++++ rails-4.0/activesupport/activesupport.gemspec	2014-01-16 14:15:03.173738401 +0100
+@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
+ 
+   s.add_dependency('i18n',       '~> 0.6', '>= 0.6.4')
+   s.add_dependency 'multi_json', '~> 1.3'
+-  s.add_dependency 'tzinfo',     '~> 0.3.37'
+-  s.add_dependency 'minitest',   '~> 4.2'
++  s.add_dependency 'tzinfo',     '>= 0.3.37'
++  s.add_dependency 'minitest',   '> 4.2'
+   s.add_dependency 'thread_safe','~> 0.1'
+ end
+Index: rails-4.0/actionpack/actionpack.gemspec
+===================================================================
+--- rails-4.0.orig/actionpack/actionpack.gemspec	2013-06-03 13:14:42.100796407 +0200
++++ rails-4.0/actionpack/actionpack.gemspec	2014-01-16 14:15:38.925520202 +0100
+@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
+   s.requirements << 'none'
+ 
+   s.add_dependency 'activesupport', version
+-  s.add_dependency 'builder',       '~> 3.1.0'
++  s.add_dependency 'builder',       '> 3.1'
+   s.add_dependency 'rack',          '~> 1.5.2'
+   s.add_dependency 'rack-test',     '~> 0.6.2'
+   s.add_dependency 'erubis',        '~> 2.7.0'
+Index: rails-4.0/activemodel/activemodel.gemspec
+===================================================================
+--- rails-4.0.orig/activemodel/activemodel.gemspec	2013-06-03 13:14:42.136795912 +0200
++++ rails-4.0/activemodel/activemodel.gemspec	2014-01-16 14:15:50.241451140 +0100
+@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
+ 
+   s.add_dependency 'activesupport', version
+ 
+-  s.add_dependency 'builder', '~> 3.1.0'
++  s.add_dependency 'builder', '> 3.1'
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 2b14994..34861b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+relax-dependencies
 mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch

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