[DRE-commits] [gem2deb] 01/02: dh-make-ruby: add gem runtime dependencies to Build-Depends: as well

[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 0079790e3dcd0279a1092313ecf4d37d2b03852f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Mar 14 19:50:27 2015 -0300

    dh-make-ruby: add gem runtime dependencies to Build-Depends: as well
---
 debian/changelog                                 | 1 +
 lib/gem2deb/dh_make_ruby.rb                      | 2 --
 lib/gem2deb/dh_make_ruby/template/debian/control | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f62405f..c5f9b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gem2deb (0.13) UNRELEASED; urgency=medium
 
   * dh-make-ruby: bump Standards-Version in template to 3.9.6
+  * dh-make-ruby: add gem runtime dependencies to Build-Depends: as well
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 28 Feb 2015 13:27:25 -0300
 
diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index c5cae0c..302bd4b 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -348,8 +348,6 @@ module Gem2Deb
       end
       def dependencies
         @dependencies ||= [
-          '${shlibs:Depends}',
-          '${misc:Depends}',
           'ruby | ruby-interpreter',
         ]
       end
diff --git a/lib/gem2deb/dh_make_ruby/template/debian/control b/lib/gem2deb/dh_make_ruby/template/debian/control
index a2edfd5..b765173 100644
--- a/lib/gem2deb/dh_make_ruby/template/debian/control
+++ b/lib/gem2deb/dh_make_ruby/template/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: <%= maintainer['DEBFULLNAME'] %> <<%= maintainer['DEBEMAIL'] %>>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb<%= extra_build_dependencies.map { |d| ", #{d}" }.join %>
+Build-Depends: debhelper (>= 7.0.50~), gem2deb<%= (extra_build_dependencies + binary_package.dependencies).map { |d| ", #{d}" }.join %>
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/<%= source_package_name %>.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/<%= source_package_name %>.git;a=summary
@@ -14,7 +14,7 @@ XS-Ruby-Versions: <%= ruby_versions %>
 Package: <%= binary_package.name %>
 Architecture: <%= binary_package.architecture %>
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: <%= binary_package.dependencies.join(', ') %>
+Depends: ${shlibs:Depends}, ${misc:Depends}, <%= binary_package.dependencies.join(', ') %>
 Description: <%= short_description ? short_description : 'FIXME' %>
 <% if long_description %>
 <%= long_description.lines.map { |line| ' ' + (line.strip.empty? ? '.' : line.strip) }.join("\n") + "\n" %>

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