[DRE-commits] [ruby-oj] 01/01: Cut dependency chain

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-oj.

commit db4777d1d09b36288e77c84364c23f14a7a58c47
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Sep 8 11:31:43 2015 +0000

    Cut dependency chain
    
    Don't build-depend on ruby-activemodel/activesupport, to cut
    dependency chain at a sane point. Oj has integration with rails,
    but doesn't actively need rails. This also disables the test for
    the rails integration.
---
 debian/changelog     | 10 ++++++++++
 debian/control       |  6 +-----
 debian/ruby-tests.rb |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4885a81..29d6de0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-oj (2.12.10-2) unstable; urgency=medium
+
+  * Team upload.
+  * Don't build-depend on ruby-activemodel/activesupport, to cut
+    dependency chain at a sane point. Oj has integration with rails,
+    but doesn't actively need rails. This also disables the test for
+    the rails integration.
+
+ -- Christian Hofstaedtler <zeha at debian.org>  Tue, 08 Sep 2015 11:30:22 +0000
+
 ruby-oj (2.12.10-1) unstable; urgency=medium
 
   * Imported Upstream version 2.12.10
diff --git a/debian/control b/debian/control
index 856f07e..c91014c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,6 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Cédric Boutillier <boutil at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                gem2deb (>= 0.5~),
-               ruby-active-model-serializers,
-               ruby-activemodel,
-               ruby-activerecord,
-               ruby-activesupport,
                ruby-minitest (>= 5.0~),
                ruby-railties,
                ruby-sqlite3
@@ -23,9 +19,9 @@ Package: ruby-oj
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
-         ruby-activesupport,
          ${misc:Depends},
          ${shlibs:Depends}
+Suggests: ruby-activesupport
 Description: fast JSON parser and serializer for Ruby
  JSON (or JavaScript Object Notation) is a text-based open standard designed
  for human-readable data interchange.
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index a6a851e..b9baf99 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -2,6 +2,8 @@ ENV['TZ']="Europe/Paris"
 
 success=true
 Dir.glob("./test/{isolated,.}/test*.rb").each do |f|
+  # we'd like to not have rails in Build-Depends, but this means we can't test the rails integration.
+  next if f == './test/./test_serializer.rb'
   puts "-------- running #{f} test ------- "
   #system("TZ='Europe/Paris' #{ENV['RUBY_TEST_BIN']} -I#{ENV['RUBYLIB']} #{f}") or success=false
   system("#{ENV['RUBY_TEST_BIN']} -I#{ENV['RUBYLIB']} #{f}") or success=false

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