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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit ec4a693d7b2e2b66ec86e039c671ae3c25d3d4fa
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Feb 9 19:42:51 2012 -0200

    Package for 1.9 too

diff --git a/debian/control b/debian/control
index a316e40..94ada58 100644
--- a/debian/control
+++ b/debian/control
@@ -11,12 +11,12 @@ Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ohai.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ohai.git;a=summary
 Homepage: http://wiki.opscode.com/display/chef/Ohai
-XS-Ruby-Versions: ruby1.8
+XS-Ruby-Versions: all
 
 Package: ohai
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Replaces: libohai-ruby (<< 0.6.10-1~), libohai-ruby1.8 (<< 0.6.10-1~), ohai-doc (<< 0.6.10-1~)
 Breaks: libohai-ruby (<< 0.6.10-1~), libohai-ruby1.8 (<< 0.6.10-1~), ohai-doc (<< 0.6.10-1~)
 Provides: libohai-ruby, libohai-ruby1.8, ohai-doc
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index f6d0a8a..a58a42f 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1 +1,2 @@
+require 'rspec'
 Dir['{spec}/**/*.rb'].each { |f| require f }
diff --git a/debian/rules b/debian/rules
index a41ec10..c6142f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,4 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-# It is just profiling rubygems, not using it.
-# Discussion http://lists.debian.org/debian-ruby/2012/01/msg00099.html
-export DH_RUBY_IGNORE_TESTS=require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

-- 
ohai.git