[DRE-commits] [diaspora] 01/01: remove sidekiq 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 ef4f76f72a9244bcfdba7cf70c525d4eff974a18
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat May 2 12:20:21 2015 +0530

    remove sidekiq version patch
---
 debian/patches/004-lower-sidekiq-version.patch | 13 -------------
 debian/patches/030-loosen-tiny-versions.patch  |  9 +++++++++
 debian/patches/series                          |  1 -
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/patches/004-lower-sidekiq-version.patch b/debian/patches/004-lower-sidekiq-version.patch
deleted file mode 100644
index d213fe5..0000000
--- a/debian/patches/004-lower-sidekiq-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require:
- 
- # Background processing
- 
--gem "sidekiq", "3.3.3"
-+gem "sidekiq", "3.2.6"
- gem "sinatra", "1.4.6"
- 
- # Scheduled processing
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 1be3fc5..933bbf9 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -2,6 +2,15 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
+@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require:
+ 
+ # Background processing
+ 
+-gem "sidekiq", "3.3.3"
++gem "sidekiq", "~> 3.3.3"
+ gem "sinatra", "1.4.6"
+ 
+ # Scheduled processing
 @@ -71,7 +71,7 @@ gem "activerecord-import", "0.7.0"
  
  gem "carrierwave", "0.10.0"
diff --git a/debian/patches/series b/debian/patches/series
index bfcef75..135eb3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 002-remove-development-test-from-gemfile.patch
 003-remove-gemfile-lock.patch
-004-lower-sidekiq-version.patch
 005-loosen-rails-version.patch
 006-loosen-messagebus-ruby-api-version.patch
 007-loosen-roxml-version.patch

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