[DRE-commits] [ruby-sidekiq] 03/04: refresh patch, permissions

[Praveen Arimbrathodiyil]

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

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

commit 62d5d1356779379fb0aa8668259492fc724f986c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Nov 1 15:09:16 2016 +0530

    refresh patch, permissions
---
 debian/changelog                     |  2 ++
 debian/patches/web-path-change.patch | 22 ++++++++++++----------
 debian/rules                         | 10 ----------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8e1c39..d26a79e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-sidekiq (4.2.3+dfsg-1) unstable; urgency=medium
 
   * New upstream release
+  * Refresh patches
+  * Update file permission changes (some files are removed upstream)
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 01 Nov 2016 15:00:06 +0530
 
diff --git a/debian/patches/web-path-change.patch b/debian/patches/web-path-change.patch
index 05f6c0a..9b0b485 100644
--- a/debian/patches/web-path-change.patch
+++ b/debian/patches/web-path-change.patch
@@ -4,14 +4,16 @@ Description: use web directory from /usr/share
 Author: Pirate Praveen <praveen at debian.org>
 Last-Updated: 2014-08-27
 
---- 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'
+Index: ruby-sidekiq/lib/sidekiq/web.rb
+===================================================================
+--- ruby-sidekiq.orig/lib/sidekiq/web.rb
++++ ruby-sidekiq/lib/sidekiq/web.rb
+@@ -18,7 +18,7 @@ require 'rack/session/cookie'
  
--    set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
-+    set :root, File.expand_path(File.dirname(__FILE__) + "/../../../../share/ruby-sidekiq/web")
-     set :public_folder, proc { "#{root}/assets" }
-     set :views, proc { "#{root}/views" }
-     set :locales, ["#{root}/locales"]
+ module Sidekiq
+   class Web
+-    ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../web")
++    ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../../../share/ruby-sidekiq/web")
+     VIEWS = "#{ROOT}/views".freeze
+     LOCALES = ["#{ROOT}/locales".freeze]
+     LAYOUT = "#{VIEWS}/layout.erb".freeze
diff --git a/debian/rules b/debian/rules
index 11e204e..fc679da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,13 +18,8 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
 override_dh_auto_build:
 	dh_auto_build -O--buildsystem=ruby
 	chmod -x web/assets/stylesheets/bootstrap.css
-	chmod -x web/assets/images/status-sd8051fd480.png
-	chmod -x web/assets/images/status/idle.png
 	chmod -x web/assets/stylesheets/application.css
-	chmod -x web/assets/images/bootstrap/glyphicons-halflings-white.png
-	chmod -x web/assets/images/bootstrap/glyphicons-halflings.png
 	chmod -x web/assets/images/logo.png
-	chmod -x web/assets/images/status/active.png
 	cat /usr/share/javascript/jquery/jquery.min.js /usr/share/javascript/jquery-timeago/jquery.timeago.min.js > web/assets/javascripts/application.js
 	cat /usr/share/javascript/d3/d3.min.js /usr/share/javascript/rickshaw/rickshaw.min.js > web/assets/javascripts/dashboard.js
 
@@ -34,13 +29,8 @@ override_dh_auto_clean:
 	debian/stop-redis-server.sh || true
 	rm -rf coverage
 	chmod +x web/assets/stylesheets/bootstrap.css
-	chmod +x web/assets/images/status-sd8051fd480.png
-	chmod +x web/assets/images/status/idle.png
 	chmod +x web/assets/stylesheets/application.css
-	chmod +x web/assets/images/bootstrap/glyphicons-halflings-white.png
-	chmod +x web/assets/images/bootstrap/glyphicons-halflings.png
 	chmod +x web/assets/images/logo.png
-	chmod +x web/assets/images/status/active.png
 	rm -rf web/assets/javascripts/application.js
 	rm -rf web/assets/javascripts/dashboard.js
 

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