[DRE-commits] [diaspora] 54/257: refresh loosen-sinatra-version.patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit 3246ad5bafd786ae04669eae69c39df5376b181b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 14 21:54:06 2014 +0530

    refresh loosen-sinatra-version.patch
---
 debian/patches/005-loosen-sinatra-version.patch | 13 +++++++++++++
 debian/patches/loosen-sinatra-version.patch     | 11 -----------
 debian/patches/series                           |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/patches/005-loosen-sinatra-version.patch b/debian/patches/005-loosen-sinatra-version.patch
new file mode 100644
index 0000000..cd7f59b
--- /dev/null
+++ b/debian/patches/005-loosen-sinatra-version.patch
@@ -0,0 +1,13 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -30,7 +30,7 @@ gem 'simple_captcha2', '0.3.2', :require
+ # Background processing
+ 
+ gem 'sidekiq', '3.2.6'
+-gem 'sinatra', '1.3.3'
++gem 'sinatra', '>=1.3.3'
+ 
+ # Scheduled processing
+ 
diff --git a/debian/patches/loosen-sinatra-version.patch b/debian/patches/loosen-sinatra-version.patch
deleted file mode 100644
index ab63c2d..0000000
--- a/debian/patches/loosen-sinatra-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -22,7 +22,7 @@
- # Background processing
- 
- gem 'sidekiq', '>= 2.17.2'
--gem 'sinatra', '1.3.3'
-+gem 'sinatra', '>= 1.3.3'
- 
- # Configuration
- 
diff --git a/debian/patches/series b/debian/patches/series
index 38d30da..514bf55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@ add-manual-requires-skip-bundler-setup.patch
 remove-development-test-from-gemfile.patch
 remove-gemfile-lock.patch
 004-loosen-sidekiq-version.patch
-loosen-sinatra-version.patch
+005-loosen-sinatra-version.patch
 loosen-rack-cors-version.patch
 loosen-mysql2-version.patch
 loosen-activerecord-import-version.patch

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