[DRE-commits] [ohai] 03/14: debian/patches: refresh patches

[Lucas Kanashiro]

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

kanashiro-guest pushed a commit to branch master
in repository ohai.

commit d312886b0ec95e56c602ce11b427605d21b7dac9
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Thu Mar 3 19:04:24 2016 -0300

    debian/patches: refresh patches
    
    Drop 0003-Ruby-plugin-run-only-against-default-Ruby.patch, already applied by upstream
---
 debian/changelog                                       |  3 +++
 debian/patches/0001-Drop-dependency-on-wmi-lite.patch  | 14 ++++----------
 ...003-Ruby-plugin-run-only-against-default-Ruby.patch | 18 ------------------
 debian/patches/series                                  |  1 -
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a130171..34af0d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 ohai (8.10.0-1) UNRELEASED; urgency=medium
 
   * Imported Upstream version 8.10.0
+  * debian/patches: refresh patches and drop
+    0003-Ruby-plugin-run-only-against-default-Ruby.patch, already applied by
+    upstream
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Thu, 03 Mar 2016 18:58:48 -0300
 
diff --git a/debian/patches/0001-Drop-dependency-on-wmi-lite.patch b/debian/patches/0001-Drop-dependency-on-wmi-lite.patch
index 3f0ecfa..c8b7732 100644
--- a/debian/patches/0001-Drop-dependency-on-wmi-lite.patch
+++ b/debian/patches/0001-Drop-dependency-on-wmi-lite.patch
@@ -9,11 +9,9 @@ wmi-lite is a Windows thing, so we definitely do not need it.
  spec/unit/plugins/kernel_spec.rb |  1 -
  3 files changed, 16 deletions(-)
 
-diff --git a/metadata.yml b/metadata.yml
-index 7271728..e4e92e6 100644
 --- a/metadata.yml
 +++ b/metadata.yml
-@@ -129,20 +129,6 @@ dependencies:
+@@ -109,20 +109,6 @@ dependencies:
        - !ruby/object:Gem::Version
          version: '0'
  - !ruby/object:Gem::Dependency
@@ -34,23 +32,19 @@ index 7271728..e4e92e6 100644
    name: ffi
    requirement: !ruby/object:Gem::Requirement
      requirements:
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 69faded..c829eff 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -9,7 +9,6 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
+@@ -9,7 +9,6 @@ $:.unshift(File.dirname(__FILE__) + '/..
  
  require 'spec/support/platform_helpers'
  require 'spec/support/integration_helper'
 -require 'wmi-lite'
  require 'ohai'
- Ohai::Config[:log_level] = :error
+ Ohai.config[:log_level] = :error
  
-diff --git a/spec/unit/plugins/kernel_spec.rb b/spec/unit/plugins/kernel_spec.rb
-index 643e2c2..18bc7c3 100644
 --- a/spec/unit/plugins/kernel_spec.rb
 +++ b/spec/unit/plugins/kernel_spec.rb
-@@ -37,7 +37,6 @@ describe Ohai::System, "plugin kernel" do
+@@ -39,7 +39,6 @@ describe Ohai::System, "plugin kernel" d
  
    describe "when running on windows", :windows_only do
      before do
diff --git a/debian/patches/0003-Ruby-plugin-run-only-against-default-Ruby.patch b/debian/patches/0003-Ruby-plugin-run-only-against-default-Ruby.patch
deleted file mode 100644
index 4631463..0000000
--- a/debian/patches/0003-Ruby-plugin-run-only-against-default-Ruby.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Wed, 17 Jun 2015 21:07:18 -0300
-Subject: Ruby plugin: run only against default Ruby
-
----
- spec/unit/plugins/ruby_spec.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/unit/plugins/ruby_spec.rb b/spec/unit/plugins/ruby_spec.rb
-index cf8d82b..16f746c 100644
---- a/spec/unit/plugins/ruby_spec.rb
-+++ b/spec/unit/plugins/ruby_spec.rb
-@@ -57,4 +57,4 @@ describe Ohai::System, "plugin ruby" do
-     end
-   end
-   
--end
-+end if ENV['RUBY_TEST_BIN'] == File.basename(ruby_bin)
diff --git a/debian/patches/series b/debian/patches/series
index 83016c8..8e72fd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Drop-dependency-on-wmi-lite.patch
 0002-Avoid-dependency-on-rspec-collection_matchers.patch
-0003-Ruby-plugin-run-only-against-default-Ruby.patch

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