[DRE-commits] [diaspora] 188/257: remove 005-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 3354a664ff1b4feee399c7fa06f86ca273d5b5f3
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Nov 30 00:22:05 2014 +0530

    remove 005-loosen-sinatra-version.patch
---
 debian/patches/005-loosen-sinatra-version.patch | 15 ---------------
 debian/patches/series                           |  1 -
 2 files changed, 16 deletions(-)

diff --git a/debian/patches/005-loosen-sinatra-version.patch b/debian/patches/005-loosen-sinatra-version.patch
deleted file mode 100644
index 1267620..0000000
--- a/debian/patches/005-loosen-sinatra-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Forwarded: https://github.com/diaspora/diaspora/issues/5394
-
-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/series b/debian/patches/series
index 2ded385..2c582ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 002-remove-development-test-from-gemfile.patch
 remove-gemfile-lock.patch
 004-lower-sidekiq-version.patch
-005-loosen-sinatra-version.patch
 006-loosen-messagebus-ruby-api-version.patch
 007-loosen-roxml-version.patch
 008-loosen-twitter-version.patch

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