[DRE-commits] [ohai] 05/12: Update packaging with a new dh-make-ruby run

[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 1cd4c3944f5fce25e22595d42ac5e4e8e148183f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 10:22:51 2015 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog            |  1 +
 debian/control              | 40 +++++++++++++++++++++++++++++-----------
 debian/ruby-tests.rake      |  7 +++++++
 debian/ruby-tests.rb        |  3 ---
 debian/rules                |  2 ++
 debian/source/local-options |  1 -
 6 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce02298..b7a52a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ohai (7.0.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Drop all patches, not needed anymore
+  * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 12 Jun 2015 23:19:12 -0300
 
diff --git a/debian/control b/debian/control
index 0f92caa..dc1ab15 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,43 @@ Source: ohai
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Joshua Timberman <joshua at opscode.com>, Praveen Arimbrathodiyil <pravi.a at gmail.com>, Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~),
- ruby-mixlib-config, ruby-mixlib-log, ruby-mixlib-cli,
- ruby-systemu, ruby-yajl, ruby-rspec, ruby-sigar,
- ruby-ipaddress
-Standards-Version: 3.9.3
+Uploaders: Joshua Timberman <joshua at opscode.com>,
+           Praveen Arimbrathodiyil <pravi.a at gmail.com>,
+           Antonio Terceiro <terceiro at debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-ipaddress,
+               ruby-mime-types (>= 1.16),
+               ruby-mixlib-cli,
+               ruby-mixlib-config (>= 2.0),
+               ruby-mixlib-log,
+               ruby-mixlib-shellout (>= 1.2),
+               ruby-rspec,
+               ruby-systemu (>= 2.5.2),
+               ruby-yajl
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ohai.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ohai.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ohai.git
 Homepage: http://wiki.opscode.com/display/chef/Ohai
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ohai
 Section: admin
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-ipaddress, ruby-sigar, ruby-mixlib-config, ruby-mixlib-log, ruby-systemu, ruby-yajl, ruby-mixlib-cli
-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
+Depends: ruby | ruby-interpreter,
+         ruby-ipaddress,
+         ruby-mime-types (>= 1.16),
+         ruby-mixlib-cli,
+         ruby-mixlib-config (>= 2.0),
+         ruby-mixlib-log,
+         ruby-mixlib-shellout (>= 1.2),
+         ruby-systemu (>= 2.5.2),
+         ruby-yajl,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Detects data about your operating system and reports it in JSON
  Information about your system is collected and returned as multidimensional
  attributes in JSON format. The following information is captured:
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..dcc1601
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,7 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
+end
+
+task :default => :spec
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index 2513e1e..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Encoding.default_external = 'UTF-8' if defined?(Encoding)
-require 'rspec/autorun'
-Dir['spec/**/*_spec.rb'].each { |f| require f }
diff --git a/debian/rules b/debian/rules
index c6142f6..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+export GEM2DEB_TEST_RUNNER = --check-dependencies
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

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