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

commit 21aeb46860a73ad0e4bc0ed1349bcd67983f41fb
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 17 15:33:51 2015 -0200

    Update packaging with a new dh-make-ruby run
---
 debian/changelog       |  1 +
 debian/compat          |  2 +-
 debian/control         | 20 +++++++++++++++-----
 debian/ruby-tests.rake | 10 +++-------
 debian/rules           |  2 ++
 debian/tests/control   |  2 --
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab2744a..624d319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-protected-attributes (1.1.3-1) UNRELEASED; urgency=medium
   * debian/watch: point at github since tests are not distributed to
     rubygems.org
   * New upstream release
+  * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 17 Nov 2015 15:30:20 -0200
 
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 dcbc1aa..6765a3a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,28 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-rails, ruby-sqlite3, ruby-mocha
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
+               rake,
+               ruby-activemodel (<< 2:5.0),
+               ruby-activemodel (>= 2:4.0.1),
+               ruby-mocha,
+               ruby-sqlite3,
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-protected-attributes.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-protected-attributes.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-protected-attributes.git
 Homepage: https://github.com/rails/protected_attributes
-Testsuite: autopkgtest
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-protected-attributes
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-activemodel
+Depends: ruby | ruby-interpreter,
+         ruby-activemodel (<< 2:5.0),
+         ruby-activemodel (>= 2:4.0.1),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Replaces: ruby-activemodel-3.2
 Description: Protect attributes from mass assignment in Active Record models
  Protect attributes from mass assignment
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index f82fd9b..63f3fd6 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,10 +1,6 @@
-require 'rake/testtask'
+require 'gem2deb/rake/testtask'
 
-Rake::TestTask.new do |t|
+Gem2Deb::Rake::TestTask.new do |t|
   t.libs = ['test']
-  t.pattern = 'test/**/*_test.rb'
-  t.ruby_opts = ['-w']
+  t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
 end
-
-task default: :test
-
diff --git a/debian/rules b/debian/rules
index c6142f6..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+export GEM2DEB_TEST_RUNNER = --check-dependencies
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 1ec2da3..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,2 +0,0 @@
-Test-Command: gem2deb-test-runner --autopkgtest 2>&1
-Depends: @, gem2deb-test-runner, ruby-rails, ruby-sqlite3, ruby-mocha

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