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

commit 120c61b5e9a8467a3147316c5b0cd4c153762f0b
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 14 12:06:25 2015 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog                               |  2 ++
 debian/compat                                  |  2 +-
 debian/control                                 | 19 +++++++++++++++----
 debian/patches/dont-use-bundler-in-tests.patch |  6 +++---
 debian/rules                                   | 14 ++------------
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 208af48..11af7c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-jbuilder (2.3.1-1) UNRELEASED; urgency=medium
 
+  * Team upload
   * New upstream release
+  * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 14 Aug 2015 12:03:21 -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 c883840..7d16acd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,28 @@ 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 (>= 0.3.0~), ruby-activesupport, ruby-railties, ruby-multi-json, ruby-mocha (>=0.13~)
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
+               ruby-activesupport (<< 2:5),
+               ruby-activesupport (>= 2:3.0.0),
+               ruby-mocha (>=0.13~),
+               ruby-multi-json (>= 1.2)
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-jbuilder.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-jbuilder.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-jbuilder.git
 Homepage: https://github.com/rails/jbuilder
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-jbuilder
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-activesupport, ruby-multi-json
+Depends: ruby | ruby-interpreter,
+         ruby-activesupport (<< 2:5),
+         ruby-activesupport (>= 2:3.0.0),
+         ruby-multi-json (>= 1.2),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: creation of JSON structures via a Builder-style DSL
  Jbuilder gives you a simple domain-specific language in Ruby for declaring
  JSON structures that beats massaging giant hash structures. It is particularly
diff --git a/debian/patches/dont-use-bundler-in-tests.patch b/debian/patches/dont-use-bundler-in-tests.patch
index 0b5cde7..9f9d80e 100644
--- a/debian/patches/dont-use-bundler-in-tests.patch
+++ b/debian/patches/dont-use-bundler-in-tests.patch
@@ -6,10 +6,10 @@ Description: do not use bundler in tests
 Author: Antonio Terceiro <terceiro at debian.org>
 Forwarded: not-needed
 
---- ruby-jbuilder-2.1.3.orig/test/test_helper.rb
-+++ ruby-jbuilder-2.1.3/test/test_helper.rb
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
 @@ -1,4 +1,3 @@
 -require "bundler/setup"
+ require "active_support"
  require "rails/version"
  
- if Rails::VERSION::STRING > "4.0"
diff --git a/debian/rules b/debian/rules
index 2532254..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +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=ruby1.8 ruby1.9.1 require-rubygems
-export DH_RUBY_IGNORE_TESTS=ruby1.8
-#
-# 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-jbuilder.git