[DRE-commits] [ruby-shoulda-matchers] 05/10: dh-make-ruby -w

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-shoulda-matchers.

commit a3ad4f92c9f48f1cde45b3766cd218f150bdef25
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jul 14 21:25:10 2016 -0300

    dh-make-ruby -w
    
    undo several of Praveen's changes - it won't be viable for us to run the
    tests during the build ATM
---
 debian/changelog       | 18 +-----------------
 debian/control         | 23 +++++++----------------
 debian/ruby-tests.rake |  8 +++-----
 debian/rules           |  2 +-
 4 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bdad626..e48f9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-shoulda-matchers (2.8.0-1) UNRELEASED; urgency=low
 
   [ Antonio Terceiro]
   * New upstream release
+  * Update package with a new `dh-make-ruby -w` run
 
   [ Cédric Boutillier ]
   * copyright: change to a working url in Format: field
@@ -10,30 +11,13 @@ ruby-shoulda-matchers (2.8.0-1) UNRELEASED; urgency=low
   * debian/copyright: use DEP5 copyright-format/1.0 official URL for Format field
 
   [ Praveen Arimbrathodiyil ]
-  * Imported Upstream version 2.1.0
-  * rebase to 2.1.0
-  * update doc files
-  * run tests
-  * update deps, bump std ver
-  * add ruby-rspec to b dep
-  * build depend on ruby-rails-3.2 and bundler
-  * remove Gemfile.lock
-  * unapply patches locally
-  * cleanup testapp
-  * ignore test failures with ruby 1.8
-  * needs rubygems-integration in build-dep
   * clean log directory too
-  * add ruby-sqlite3 as bdep
-  * ruby-bourne is a build dep
-  * ruby-rspec-rails is a bdep
   * add patch from Sam Ruby to fix config path
 
   [ Cédric Boutillier ]
   * Bump debhelper compatibility level to 9
   * Remove version in the gem2deb build-dependency
   * Use https:// in Vcs-* fields
-  * Use https:// in Vcs-* fields
-  * Bump Standards-Version to 3.9.7 (no changes needed)
   * Run wrap-and-sort on packaging files
 
  -- Antonio Terceiro <terceiro at debian.org>  Thu, 14 Jul 2016 21:21:47 -0300
diff --git a/debian/control b/debian/control
index 8963f5b..924710b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,33 +2,24 @@ Source: ruby-shoulda-matchers
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Antonio Terceiro <terceiro at softwarelivre.org>
-Build-Depends: bundler,
-               debhelper (>= 9~),
+Uploaders: Antonio Terceiro <terceiro at debian.org>
+Build-Depends: debhelper (>= 9~),
                gem2deb,
                rake,
-               ruby-actionpack-3.2,
-               ruby-bourne,
-               ruby-coffee-rails,
-               ruby-jquery-rails,
-               ruby-rails-3.2,
-               ruby-rspec,
-               ruby-rspec-rails,
-               ruby-sass-rails,
-               ruby-sqlite3,
-               ruby-uglifier,
-               rubygems-integration
-Standards-Version: 3.9.7
+               ruby-activesupport (>= 2:3.0.0),
+               ruby-rspec
+Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-shoulda-matchers.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-shoulda-matchers.git
 Homepage: https://github.com/thoughtbot/shoulda-matchers
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-shoulda-matchers
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
-         ruby-activesupport-3.2,
+         ruby-activesupport (>= 2:3.0.0),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Test helpers for Rails applications, compatible with Test::Unit and RSpec
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 89a753d..cf1591e 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,7 +1,5 @@
-require 'rspec/core/rake_task'
+require 'gem2deb/rake/spectask'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern      = './spec/**/*_spec.rb'
+Gem2Deb::Rake::RSpecTask.new do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
 end
-
-task :default => :spec
diff --git a/debian/rules b/debian/rules
index b32e678..d3179b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_RUBY_IGNORE_TESTS=ruby1.8
+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-shoulda-matchers.git