[DRE-commits] [ruby-mixlib-cli] 01/03: update packaging with a new dh-make-ruby run

Sat Jun 13 16:36:46 UTC 2015

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

terceiro pushed a commit to branch master
in repository ruby-mixlib-cli.

commit 52d02fb0402eb37c0817157fac96b1d1be6f0e94
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jun 12 22:48:39 2015 -0300

    update packaging with a new dh-make-ruby run
---
 debian/changelog                                |  8 ++++++++
 debian/control                                  | 12 +++++-------
 debian/patches/001-require-explicit-rspec.patch | 18 ------------------
 debian/patches/series                           |  1 -
 debian/ruby-test-files.yaml                     |  3 ---
 debian/ruby-tests.rake                          |  7 +++++++
 debian/rules                                    | 12 +-----------
 debian/source/local-options                     |  1 -
 8 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f6d266..97a4569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-mixlib-cli (1.4.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Update packaging with a new dh-make-ruby run
+  * Drop 001-require-explicit-rspec.patch, not needed anymore
+
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 12 Jun 2015 22:48:08 -0300
+
 ruby-mixlib-cli (1.4.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 463ec30..446d174 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,18 @@ 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>, Paul van Tilburg <paulvt at debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>, Praveen Arimbrathodiyil <pravi.a at gmail.com>
-Build-Depends: debhelper (>= 8.1), gem2deb (>= 0.3.0~), ruby-rspec
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mixlib-cli.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-mixlib-cli.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-mixlib-cli.git
 Homepage: http://github.com/opscode/mixlib-cli
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-mixlib-cli
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Replaces: libmixlib-cli-ruby (<< 1.2.2-1~), libmixlib-cli-ruby1.8 (<< 1.2.2-1~), libmixlib-cli-ruby1.9.1 (<< 1.2.2-1~)
-Breaks: libmixlib-cli-ruby (<< 1.2.2-1~), libmixlib-cli-ruby1.8 (<< 1.2.2-1~), libmixlib-cli-ruby1.9.1 (<< 1.2.2-1~)
-Provides: libmixlib-cli-ruby, libmixlib-cli-ruby1.8, libmixlib-cli-ruby1.9.1
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, 
 Description: Ruby mixin for creating command line applications
  It provides a class based object to parse command line options. It supports
  long and short options, descriptions, and a number of other common features.
diff --git a/debian/patches/001-require-explicit-rspec.patch b/debian/patches/001-require-explicit-rspec.patch
deleted file mode 100644
index 1172f97..0000000
--- a/debian/patches/001-require-explicit-rspec.patch
+++ /dev/null
@@ -1,18 +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/mixlib-cli/pull/6
-Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
-Last-Update: 27-12-2011
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,6 +1,7 @@
- $TESTING=true
- $:.push File.join(File.dirname(__FILE__), '..', 'lib')
- 
-+require 'rspec'
- require 'mixlib/cli'
- 
- class TestCLI
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d8318f9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-001-require-explicit-rspec.patch
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 533e56c..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
---- 
-- spec/mixlib/cli_spec.rb
-- spec/spec_helper.rb
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/rules b/debian/rules
index a5e7dc8..16e6b42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,5 @@
 #!/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.8 ruby1.9.1 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
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/ruby-mixlib-cli.git

