[DRE-commits] [ruby-sidekiq] 03/06: Refreshed patches

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-sidekiq.

commit 2d6cded8ff8f62e6ce5855cbece8909ab15cc84f
Author: Sruthi Chandran <srud at disroot.org>
Date:   Sat Aug 27 19:31:50 2016 +0530

    Refreshed patches
---
 debian/patches/require-standard-cli.patch | 10 ++++------
 debian/patches/web-path-change.patch      | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/patches/require-standard-cli.patch b/debian/patches/require-standard-cli.patch
index 239c91e..7cded8f 100644
--- a/debian/patches/require-standard-cli.patch
+++ b/debian/patches/require-standard-cli.patch
@@ -3,13 +3,11 @@ Description: Remove relative path from require
 Author: Pirate Praveen <praveen at debian.org>
 Last-Updated: 2014-09-09
 
-Index: ruby-sidekiq/bin/sidekiq
-===================================================================
---- ruby-sidekiq.orig/bin/sidekiq
-+++ ruby-sidekiq/bin/sidekiq
-@@ -5,7 +5,7 @@
+--- a/bin/sidekiq
++++ b/bin/sidekiq
+@@ -4,7 +4,7 @@
+ # RUBYOPT=-w bundle exec sidekiq
  $TESTING = false
- $CELLULOID_DEBUG = false
  
 -require_relative '../lib/sidekiq/cli'
 +require 'sidekiq/cli'
diff --git a/debian/patches/web-path-change.patch b/debian/patches/web-path-change.patch
index 63b7d77..05f6c0a 100644
--- a/debian/patches/web-path-change.patch
+++ b/debian/patches/web-path-change.patch
@@ -4,13 +4,11 @@ Description: use web directory from /usr/share
 Author: Pirate Praveen <praveen at debian.org>
 Last-Updated: 2014-08-27
 
-Index: ruby-sidekiq/lib/sidekiq/web.rb
-===================================================================
---- ruby-sidekiq.orig/lib/sidekiq/web.rb
-+++ ruby-sidekiq/lib/sidekiq/web.rb
-@@ -14,7 +14,7 @@ module Sidekiq
+--- a/lib/sidekiq/web.rb
++++ b/lib/sidekiq/web.rb
+@@ -15,7 +15,7 @@
      enable :sessions
-     use Rack::Protection, :use => :authenticity_token unless ENV['RACK_ENV'] == 'test'
+     use ::Rack::Protection, :use => :authenticity_token unless ENV['RACK_ENV'] == 'test'
  
 -    set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
 +    set :root, File.expand_path(File.dirname(__FILE__) + "/../../../../share/ruby-sidekiq/web")

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