[DRE-commits] [rails] 01/01: patch gemspec too

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository rails.

commit 784bd0b5ce0b40788b584d062d25af87dfbbaced
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jul 23 09:55:56 2016 +0530

    patch gemspec too
---
 debian/patches/0005-relax-json.patch | 13 +++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 14 insertions(+)

diff --git a/debian/patches/0005-relax-json.patch b/debian/patches/0005-relax-json.patch
new file mode 100644
index 0000000..bcf573a
--- /dev/null
+++ b/debian/patches/0005-relax-json.patch
@@ -0,0 +1,13 @@
+allow ruby-json 2.0.1 in the archive
+
+--- a/activesupport/activesupport.gemspec
++++ b/activesupport/activesupport.gemspec
+@@ -21,7 +21,7 @@
+   s.rdoc_options.concat ['--encoding',  'UTF-8']
+ 
+   s.add_dependency 'i18n',       '~> 0.7'
+-  s.add_dependency 'json',       '~> 1.7', '>= 1.7.7'
++  s.add_dependency 'json',       '>= 1.7.7'
+   s.add_dependency 'tzinfo',     '~> 1.1'
+   s.add_dependency 'minitest',   '~> 5.1'
+   s.add_dependency 'thread_safe','~> 0.3', '>= 0.3.4'
diff --git a/debian/patches/series b/debian/patches/series
index e3a54f7..f05e82d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Be-careful-with-that-bundler.patch
 0002-load_paths.rb-don-t-load-bundler.patch
 0004-ActiveRecord-adjust-test-suite-for-Debian-build.patch
+0005-relax-json.patch

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