[DRE-commits] [diaspora] 187/257: lower sidekiq version, 3.3.0 tests fail

[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 08a4e6a882024abc546e14ca28ad7ee78eac8849
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Nov 30 00:20:33 2014 +0530

    lower sidekiq version, 3.3.0 tests fail
---
 debian/patches/004-loosen-sidekiq-version.patch | 29 -------------------------
 debian/patches/004-lower-sidekiq-version.patch  | 13 +++++++++++
 debian/patches/series                           |  2 +-
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/debian/patches/004-loosen-sidekiq-version.patch b/debian/patches/004-loosen-sidekiq-version.patch
deleted file mode 100644
index 49f1b4b..0000000
--- a/debian/patches/004-loosen-sidekiq-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7d01c6afc05b53d6c04c5ba16e93898dc97f9067 Mon Sep 17 00:00:00 2001
-From: Praveen Arimbrathodiyil <praveen at debian.org>
-Date: Fri, 14 Nov 2014 21:44:09 +0530
-Subject: [PATCH] bump sidekiq to 3.2.6
-
-From upstream changelog,
-
-    Deprecate delay extension for ActionMailer 4.2+ . [seuros, #1933]
-    Poll interval tuning now accounts for dead processes [epchris, #1984]
-    Add non-production environment to Web UI page titles [JacobEvelyn, #2004]
-
-Debian already have 3.2.6 and I'd like to keep both versions in sync.
----
- Gemfile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -29,7 +29,7 @@ gem 'simple_captcha2', '0.3.2', :require
- 
- # Background processing
- 
--gem 'sidekiq', '3.2.5'
-+gem 'sidekiq', '3.2.6'
- gem 'sinatra', '1.3.3'
- 
- # Scheduled processing
diff --git a/debian/patches/004-lower-sidekiq-version.patch b/debian/patches/004-lower-sidekiq-version.patch
new file mode 100644
index 0000000..0a7a038
--- /dev/null
+++ b/debian/patches/004-lower-sidekiq-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.3.0'
++gem 'sidekiq', '3.2.6'
+ gem 'sinatra', '1.4.5'
+ 
+ # Scheduled processing
diff --git a/debian/patches/series b/debian/patches/series
index 2444cec..2ded385 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 002-remove-development-test-from-gemfile.patch
 remove-gemfile-lock.patch
-004-loosen-sidekiq-version.patch
+004-lower-sidekiq-version.patch
 005-loosen-sinatra-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