[DRE-commits] [diaspora] 53/257: refresh loosen-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 259898c66e9d8d927bd8abb0a432bc74789d5ec3
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 14 21:48:25 2014 +0530

    refresh loosen-sidekiq-version.patch
---
 debian/patches/004-loosen-sidekiq-version.patch | 29 +++++++++++++++++++++++++
 debian/patches/loosen-sidekiq-version.patch     | 11 ----------
 debian/patches/series                           |  2 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/debian/patches/004-loosen-sidekiq-version.patch b/debian/patches/004-loosen-sidekiq-version.patch
new file mode 100644
index 0000000..49f1b4b
--- /dev/null
+++ b/debian/patches/004-loosen-sidekiq-version.patch
@@ -0,0 +1,29 @@
+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/loosen-sidekiq-version.patch b/debian/patches/loosen-sidekiq-version.patch
deleted file mode 100644
index 001fda6..0000000
--- a/debian/patches/loosen-sidekiq-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -21,7 +21,7 @@
- 
- # Background processing
- 
--gem 'sidekiq', '2.17.2'
-+gem 'sidekiq', '>= 2.17.2'
- gem 'sinatra', '1.3.3'
- 
- # Configuration
diff --git a/debian/patches/series b/debian/patches/series
index ecb9c45..38d30da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 add-manual-requires-skip-bundler-setup.patch
 remove-development-test-from-gemfile.patch
 remove-gemfile-lock.patch
-loosen-sidekiq-version.patch
+004-loosen-sidekiq-version.patch
 loosen-sinatra-version.patch
 loosen-rack-cors-version.patch
 loosen-mysql2-version.patch

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