[DRE-commits] [ohai] 04/12: Drop all patches, not needed anymore

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ohai.

commit 8ce52f0d15f84113b3511681a8d41c24ed3b94d3
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 10:17:29 2015 -0300

    Drop all patches, not needed anymore
---
 debian/changelog                                   |  1 +
 debian/patches/Missing-require-rubygems.patch      | 15 -----
 ...in-Ruby-plugin-test-data-from-system-ruby.patch | 69 ----------------------
 debian/patches/series                              |  2 -
 4 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bb60ba..ce02298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ohai (7.0.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Drop all patches, not needed anymore
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 12 Jun 2015 23:19:12 -0300
 
diff --git a/debian/patches/Missing-require-rubygems.patch b/debian/patches/Missing-require-rubygems.patch
deleted file mode 100644
index 21bf34c..0000000
--- a/debian/patches/Missing-require-rubygems.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add missing `require 'rubygems'`
- Without this, the tests do not pass under Ruby 1.8
-Author: Antonio Terceiro <terceiro at debian.org>
-
---- ohai-0.6.12.orig/spec/ohai/plugins/ruby_spec.rb
-+++ ohai-0.6.12/spec/ohai/plugins/ruby_spec.rb
-@@ -16,7 +16,7 @@
- # limitations under the License.
- #
- 
--
-+require 'rubygems'
- require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
- 
- ruby_bin = File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])
diff --git a/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby.patch b/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby.patch
deleted file mode 100644
index c557dfb..0000000
--- a/debian/patches/Obtain-Ruby-plugin-test-data-from-system-ruby.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Obtain Ruby plugin test data from system ruby
- This fixes the tests for the case where `ruby` is not the same Ruby
- interpreter as the one you are running the tests against. For example, the
- `ruby` in yout $PATH might be Ruby 1.8, but you are running the tests under
- Ruby 1.9 (or vice-versa).
-Author: Antonio Terceiro <terceiro at softwarelivre.org>
-Bug: http://tickets.opscode.com/browse/OHAI-332
-
---- ohai-0.6.12.orig/spec/ohai/plugins/ruby_spec.rb
-+++ ohai-0.6.12/spec/ohai/plugins/ruby_spec.rb
-@@ -18,8 +18,7 @@
- 
- require 'rubygems'
- require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
--
--ruby_bin = File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])
-+require 'tempfile'
- 
- describe Ohai::System, "plugin ruby" do
- 
-@@ -36,23 +35,36 @@ describe Ohai::System, "plugin ruby" do
-     @ruby_ohai_data = @ruby_ohai_data_pristine.dup
-   end
- 
--  {
-+  code = <<-EOS
-+  require 'rbconfig'
-+  require 'rubygems'
-+  ruby_bin = File.join(::RbConfig::CONFIG['bindir'], ::RbConfig::CONFIG['ruby_install_name'])
-+  data = {
-     :platform => RUBY_PLATFORM,
-     :version => RUBY_VERSION,
-     :release_date => RUBY_RELEASE_DATE,
--    :target => ::Config::CONFIG['target'],
--    :target_cpu => ::Config::CONFIG['target_cpu'],
--    :target_vendor => ::Config::CONFIG['target_vendor'],
--    :target_os => ::Config::CONFIG['target_os'],
--    :host => ::Config::CONFIG['host'],
--    :host_cpu => ::Config::CONFIG['host_cpu'],
--    :host_os => ::Config::CONFIG['host_os'],
--    :host_vendor => ::Config::CONFIG['host_vendor'],
--    :gems_dir => %x{#{ruby_bin} #{::Config::CONFIG['bindir']}/gem env gemdir}.chomp!,
--    :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::Config::CONFIG['bindir']}/#{bin}"
-+    :target => ::RbConfig::CONFIG['target'],
-+    :target_cpu => ::RbConfig::CONFIG['target_cpu'],
-+    :target_vendor => ::RbConfig::CONFIG['target_vendor'],
-+    :target_os => ::RbConfig::CONFIG['target_os'],
-+    :host => ::RbConfig::CONFIG['host'],
-+    :host_cpu => ::RbConfig::CONFIG['host_cpu'],
-+    :host_os => ::RbConfig::CONFIG['host_os'],
-+    :host_vendor => ::RbConfig::CONFIG['host_vendor'],
-+    :gems_dir => %x{\#{ruby_bin} \#{::RbConfig::CONFIG['bindir']}/gem env gemdir}.chomp!,
-+    :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "\#{::RbConfig::CONFIG['bindir']}/\#{bin}"
-       }.find{|bin| ::File.exists? bin},
-     :ruby_bin => ruby_bin
--  }.each do |attribute, value|
-+  }
-+  puts data.inspect
-+  EOS
-+  program = Tempfile.new('ruby')
-+  program.write(code)
-+  program.close
-+  data = eval(`ruby #{program.path}`)
-+  program.unlink
-+
-+  data.each do |attribute, value|
-     it "should have #{attribute} set" do
-       @ruby_ohai_data[attribute].should eql(value)
-     end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ef55561..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Missing-require-rubygems.patch
-Obtain-Ruby-plugin-test-data-from-system-ruby.patch

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