[DRE-commits] [ruby-specinfra] 04/04: 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 ruby-specinfra.

commit 6210ff2a1a194e6706527d4e94aee26fa443b37b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 19:06:06 2015 -0300

    Update packaging with a new dh-make-ruby run
    
    debian/ruby-tests.rake: load the upstream Rakefile instead of
    duplicating it
---
 debian/changelog               |  2 ++
 debian/control                 | 24 +++++++++++++++++-------
 debian/ruby-specinfra.examples |  1 +
 debian/ruby-tests.rake         | 19 +------------------
 debian/rules                   | 13 ++-----------
 5 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74481c1..3acaf9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-specinfra (2.35.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Update packaging with a new dh-make-ruby run
+  * debian/ruby-tests.rake: load upstream Rakefile instead of duplicating it.
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 18:57:57 -0300
 
diff --git a/debian/control b/debian/control
index e5d27ac..f96849c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,29 @@ Source: ruby-specinfra
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: KURASHIKI Satoru <lurdan at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~), rake, ruby-rspec, lsb-release
-Standards-Version: 3.9.5
-Vcs-Git: https://github.com/lurdan/serverspec.git
-Vcs-Browser: https://github.com/lurdan/specinfra/tree/dpkg
+Uploaders: KURASHIKI Satoru <lurdan at gmail.com>,
+           Antonio Terceiro <terceiro at debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-net-scp,
+               ruby-net-ssh,
+               ruby-rspec
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-specinfra.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-specinfra.git
 Homepage: http://github.com/serverspec/specinfra/
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-specinfra
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, rake, ruby-rspec, lsb-release
-# bundler (~> 1.3, development)
+Depends: ruby | ruby-interpreter,
+         ruby-net-scp,
+         ruby-net-ssh,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Common layer for serverspec and configspec
  This package is backend library for ruby-serverspec, which was
  extracted from serverspec for further abstracction, intended to
diff --git a/debian/ruby-specinfra.examples b/debian/ruby-specinfra.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/ruby-specinfra.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 9455e58..0c75a56 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,20 +1,3 @@
-require 'rspec/core/rake_task'
+load 'Rakefile'
 
 task :default => 'spec:all'
-
-namespace :spec do
-  task :all => [ :helper, :backend, :configuration ]
-
-  RSpec::Core::RakeTask.new(:helper) do |t|
-    t.pattern = "spec/helper/*_spec.rb"
-  end
-
-  RSpec::Core::RakeTask.new(:backend) do |t|
-    t.pattern = "spec/backend/*/*_spec.rb"
-  end
-
-  RSpec::Core::RakeTask.new(:configuration) do |t|
-    t.pattern = "spec/configuration_spec.rb"
-  end
-end
-
diff --git a/debian/rules b/debian/rules
index 3529615..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
 #!/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:
-#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

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