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

commit 8fce492564ed085830889501c60687e3abb8f6b4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 14 14:36:48 2015 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog       |  1 +
 debian/compat          |  2 +-
 debian/control         | 14 ++++++++++----
 debian/ruby-tests.rake | 12 ++++--------
 debian/rules           | 13 ++-----------
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 702eec8..cb7ce4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-globalid (0.3.6-1) unstable; urgency=medium
 
   * New upstream release
   * fix_test_helper.patch: refresh
+  * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 14 Aug 2015 14:28:59 -0300
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index e50ce35..8151e79 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,13 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Cédric Boutillier <boutil at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-activesupport (>= 4.1~), ruby-railties, ruby-activemodel, ruby-minitest, ruby-test-unit
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
+               rake,
+               ruby-activesupport (>= 2:4.1.0)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-globalid.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-globalid.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-globalid.git
 Homepage: http://www.rubyonrails.org
 Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
@@ -14,7 +17,10 @@ XS-Ruby-Versions: all
 Package: ruby-globalid
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-activesupport (>= 4.1~)
+Depends: ruby | ruby-interpreter,
+         ruby-activesupport (>= 2:4.1.0),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ruby-railties
 Description: reference models by URI for Ruby on Rails
  A Global ID is an app wide URI of the form gid://YourApp/Some::Model/id
@@ -26,4 +32,4 @@ Description: reference models by URI for Ruby on Rails
  drop-down list of options, consisting of both Users and Groups. One has then a
  universal identifier that works for objects of both classes.
  .
- This package is part of the dependencies for the Ruby on Rails framework.
+ This package is part of the dependencies for the Ruby on Rails framework.
\ No newline at end of file
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 4aefad9..63f3fd6 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,10 +1,6 @@
-require 'rake/testtask'
+require 'gem2deb/rake/testtask'
 
-task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/cases/**/*_test.rb']
-  t.verbose = true
-  t.warning = true
+Gem2Deb::Rake::TestTask.new do |t|
+  t.libs = ['test']
+  t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
 end
diff --git a/debian/rules b/debian/rules
index d81794d..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=ruby2.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

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