[DRE-commits] [SCM] ohai.git branch, master, updated. upstream/0.6.10-22-g2e61ced

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 5cf9d9c1b0c2c32e89888f1aa2e7adb212725377
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Apr 13 07:54:55 2012 -0300

    Removing patch already applied upstream

diff --git a/debian/patches/add-require-rspec.patch b/debian/patches/add-require-rspec.patch
deleted file mode 100644
index 73772b0..0000000
--- a/debian/patches/add-require-rspec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: add explicit require for rspec
- Tests fail with "undefined method describe' for main:Object (NoMethodError)"
- .
- This patch add an explicit rspec require to fix it.
-Bug: https://github.com/opscode/ohai/pull/57
-Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
-Last-Update: 01-02-2012
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,3 +1,4 @@
-+require 'rspec'
- require 'mixlib/config'
- 
- $:.unshift(File.dirname(__FILE__) + '/../lib')
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d47b086..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add-require-rspec.patch

-- 
ohai.git