[DRE-commits] [gem2deb] 01/01: Removed hardcoded interpreter versions; use ruby-all-dev instead

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository gem2deb.

commit 8cf023c42a1fb7d156f07c4f4abe2906427ba8e7
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Feb 12 09:43:30 2014 -0300

    Removed hardcoded interpreter versions; use ruby-all-dev instead
---
 debian/changelog                               |  1 +
 debian/control                                 |  4 ++--
 lib/gem2deb.rb                                 | 21 ++++-----------------
 lib/gem2deb/dh_make_ruby/template/debian/rules |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e38ae68..27dfd37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ gem2deb (0.7.0) UNRELEASED; urgency=medium
       that is not /usr/bin/ruby will have been installed by hand so we don't
       want system binaries using external interpreters.
   * Add support for running the gem2deb testsuite with autopkgtest
+  * Removed hardcoded interpreter versions; use ruby-all-dev instead
 
   [ Cédric Boutillier ]
   * Make build of C extensions verbose (Closes: #721674)
diff --git a/debian/control b/debian/control
index 83cb1d2..23e35b0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Lucas Nussbaum <lucas at debian.org>,
            Antonio Terceiro <terceiro at debian.org>,
            Vincent Fourmond <fourmond at debian.org>,
 	   Gunnar Wolf <gwolf at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), rake, ruby-test-unit, ruby-shoulda-context, ruby-mocha (>= 0.14.0), ruby1.9.1 (>= 1.9.3.0-1~), ruby1.9.1-dev (>= 1.9.3.0-1~), ruby2.0, ruby2.0-dev, devscripts, ruby-setup, lintian
+Build-Depends: debhelper (>= 7.0.50~), rake, ruby-test-unit, ruby-shoulda-context, ruby-mocha (>= 0.14.0), ruby-all-dev (>= 1:1.9.3.4), devscripts, ruby-setup, lintian
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/gem2deb.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/gem2deb.git;a=summary
@@ -14,7 +14,7 @@ XS-Testsuite: autopkgtest
 
 Package: gem2deb
 Architecture: all
-Depends: ruby | ruby-interpreter, ruby1.9.1 (>= 1.9.3.0-1~), ruby1.9.1-dev (>= 1.9.3.0-1~), ruby2.0, ruby2.0-dev, build-essential, devscripts, debhelper (>= 7.0.50~), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby | ruby-interpreter, ruby-all-dev (>= 1:1.9.3.4), build-essential, devscripts, debhelper (>= 7.0.50~), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: Debian Ruby packaging suite
  gem2deb is a set of tools to create Debian package from ruby software
  distributed with Rubygems. gem2tgz converts the .gem file to a tar archive,
diff --git a/lib/gem2deb.rb b/lib/gem2deb.rb
index c343379..5623992 100644
--- a/lib/gem2deb.rb
+++ b/lib/gem2deb.rb
@@ -17,33 +17,20 @@ if defined?(Encoding) && Encoding.default_external.name == 'US-ASCII'
   Encoding.default_external = 'UTF-8'
 end
 
+require 'ruby_debian_dev'
+
 module Gem2Deb
 
   class CommandFailed < Exception
   end
 
-  SUPPORTED_RUBY_VERSIONS = {
-
-    #name             Ruby binary
-    #---------------  -------------------
-    'ruby1.9.1' => '/usr/bin/ruby1.9.1',
-    'ruby2.0'   => '/usr/bin/ruby2.0',
+  include RubyDebianDev
 
-  }.select do |version, binary|
+  SUPPORTED_RUBY_VERSIONS.select! do |version, binary|
     # To help backporters without having to also backport the interpreters.
     File.exists?(binary)
   end
 
-  RUBY_CONFIG_VERSION = {
-    'ruby1.9.1' => '1.9.1',
-    'ruby2.0'   => '2.0',
-  }
-
-  SUPPORTED_RUBY_SHARED_LIBRARIES = [
-    'libruby1.9.1',
-    'libruby2.0',
-  ]
-
   RUBY_SHEBANG_CALL = '/usr/bin/ruby'
 
   BIN_DIR = '/usr/bin'
diff --git a/lib/gem2deb/dh_make_ruby/template/debian/rules b/lib/gem2deb/dh_make_ruby/template/debian/rules
index 82ddc0c..5129aeb 100644
--- a/lib/gem2deb/dh_make_ruby/template/debian/rules
+++ b/lib/gem2deb/dh_make_ruby/template/debian/rules
@@ -6,7 +6,7 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
+#export DH_RUBY_IGNORE_TESTS=<%= Gem2Deb::SUPPORTED_RUBY_VERSIONS.keys.join(' ') %> require-rubygems
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

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