[DRE-commits] [ruby-commander] 03/06: 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-commander.

commit 96ff98f9c826fa563e10b8f7734ab5f242d0c1ae
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 20 20:54:44 2015 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog                                |  1 +
 debian/control                                  | 17 +++++++++++++----
 debian/patches/0001-Drop-RubyGems-Depends.patch | 17 -----------------
 debian/patches/0002-Drop-SimpleCov.patch        | 21 ---------------------
 debian/patches/series                           |  2 --
 debian/ruby-tests.rake                          | 10 ++++++----
 debian/rules                                    |  3 +++
 7 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 924b6b1..dc1f6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-commander (4.3.4-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream version
     - Compatible with rspec 3
+  * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 20 Jun 2015 20:42:04 -0300
 
diff --git a/debian/control b/debian/control
index e42617e..3456452 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,26 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Youhei SASAKI <uwabami at gfd-dennou.org>
-Build-Depends: debhelper (>= 9~), gem2deb (>= 0.5.0~), rake, ruby-rspec, ruby-highline
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-highline (>= 1.7.2),
+               ruby-rspec
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-commander.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-commander.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-commander.git
 Homepage: http://visionmedia.github.io/commander
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-commander
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-highline, less
+Depends: ruby | ruby-interpreter,
+         ruby-highline (>= 1.7.2),
+         less,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Ruby command-line interface library
  "Commander" bridges the gap between other terminal related libraries
  you know and love (OptionParser, HighLine), while providing many new
diff --git a/debian/patches/0001-Drop-RubyGems-Depends.patch b/debian/patches/0001-Drop-RubyGems-Depends.patch
deleted file mode 100644
index d32d4ee..0000000
--- a/debian/patches/0001-Drop-RubyGems-Depends.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Wed, 16 Oct 2013 16:59:26 +0900
-Subject: Drop RubyGems Depends
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- bin/commander       | 4 +---
- spec/spec_helper.rb | 3 +--
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
---- ruby-commander.orig/spec/spec_helper.rb
-+++ ruby-commander/spec/spec_helper.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'stringio'
- require 'simplecov'
- SimpleCov.start do
diff --git a/debian/patches/0002-Drop-SimpleCov.patch b/debian/patches/0002-Drop-SimpleCov.patch
deleted file mode 100644
index 373e66a..0000000
--- a/debian/patches/0002-Drop-SimpleCov.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Wed, 16 Oct 2013 16:59:47 +0900
-Subject: Drop SimpleCov
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- spec/spec_helper.rb | 2 --
- 1 file changed, 2 deletions(-)
-
---- ruby-commander.orig/spec/spec_helper.rb
-+++ ruby-commander/spec/spec_helper.rb
-@@ -1,9 +1,4 @@
- require 'stringio'
--require 'simplecov'
--SimpleCov.start do
--  add_filter "/spec/"
--end
--
- # Unshift so that local files load instead of something in gems
- $:.unshift File.dirname(__FILE__) + '/../lib'
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fe25716..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Drop-RubyGems-Depends.patch
-0002-Drop-SimpleCov.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index d7ff93f..dcc1601 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,7 @@
-require "rspec/core/rake_task"
-task :default => :spec
-RSpec::Core::RakeTask.new do |t|
-  t.verbose = false
+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 6d2b780..d0dd1aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+
+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-commander.git