[DRE-commits] [ruby-browser] 04/05: refresh patches

[Praveen Arimbrathodiyil]

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

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

commit 38465e93bffc4fd2c0cb75e6c2f9f89312f4ec85
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jun 16 13:37:14 2016 +0530

    refresh patches
---
 debian/changelog             |  1 +
 debian/patches/bundler       | 10 +++++++---
 debian/patches/relative_path | 37 +++++++++++++------------------------
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef3f6dc..4fce82a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-browser (2.1.0-1) UNRELEASED; urgency=medium
 
   * Team upload
   * New upstream major release
+  * Refresh patches
 
  -- Pirate Praveen <praveen at debian.org>  Thu, 16 Jun 2016 13:07:59 +0530
 
diff --git a/debian/patches/bundler b/debian/patches/bundler
index 302de9b..f7861e0 100644
--- a/debian/patches/bundler
+++ b/debian/patches/bundler
@@ -5,9 +5,13 @@ Forwarded: not-needed
 Last-Update: 2015-05-28
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/spec_helper.rb
-+++ b/test/spec_helper.rb
-@@ -1,5 +1,4 @@
+Index: ruby-browser/test/test_helper.rb
+===================================================================
+--- ruby-browser.orig/test/test_helper.rb
++++ ruby-browser/test/test_helper.rb
+@@ -3,7 +3,6 @@ require "codeclimate-test-reporter"
+ CodeClimate::TestReporter.start
+ 
  ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 -require "bundler/setup"
  require "minitest/autorun"
diff --git a/debian/patches/relative_path b/debian/patches/relative_path
index 248a5e8..1dd27f4 100644
--- a/debian/patches/relative_path
+++ b/debian/patches/relative_path
@@ -8,31 +8,20 @@ Last-Update: 2015-05-28
 
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/browser/methods/language.rb
-+++ b/lib/browser/methods/language.rb
-@@ -1,6 +1,10 @@
- class Browser
-   module Language
--    LANGUAGES = YAML.load_file(File.expand_path("../../../../languages.yml", __FILE__))
-+    if File.exist?(File.expand_path("../../../../../../share/ruby-browser/languages.yml", __FILE__)) then
-+        LANGUAGES = YAML.load_file(File.expand_path("../../../../../../share/ruby-browser/languages.yml", __FILE__))
-+    else
-+        LANGUAGES = YAML.load_file(File.expand_path("/usr/share/ruby-browser/languages.yml", __FILE__))
-+    end
+Index: ruby-browser/lib/browser.rb
+===================================================================
+--- ruby-browser.orig/lib/browser.rb
++++ ruby-browser/lib/browser.rb
+@@ -78,7 +78,11 @@ module Browser
+   EMPTY_STRING = "".freeze
  
-     # Set browser's preferred language
-     attr_writer :accept_language
---- a/lib/browser/methods/bots.rb
-+++ b/lib/browser/methods/bots.rb
-@@ -1,6 +1,10 @@
- class Browser
-   module Bots
--    root = Pathname.new(File.expand_path("../../../..", __FILE__))
-+    if File.exist?(File.expand_path("../../../../../../share/ruby-browser/bots.yml", __FILE__)) and File.exist?(File.expand_path("../../../../../../share/ruby-browser/search_engines.yml", __FILE__)) then
-+        root = Pathname.new(File.expand_path("../../../../../../share/ruby-browser/", __FILE__))
+   def self.root
+-    @root ||= Pathname.new(File.expand_path("../..", __FILE__))
++    if Pathname.new(File.expand_path('/usr/share/ruby-browser')).exist?
++      @root = Pathname.new(File.expand_path('/usr/share/ruby-browser'))
 +    else
-+        root = Pathname.new(File.expand_path("/usr/share/ruby-browser/", __FILE__))
++      @root ||= Pathname.new(File.expand_path("../..", __FILE__))
 +    end
-     BOTS = YAML.load_file(root.join("bots.yml"))
-     SEARCH_ENGINES = YAML.load_file(root.join("search_engines.yml"))
+   end
  
+   # Hold the list of browser matchers.

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