[DRE-commits] [gem2deb] 06/07: Merge branch 'master' into autopkgtest

[Cédric Boutillier]

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

boutil pushed a commit to branch autopkgtest
in repository gem2deb.

commit 21030bfe23ee23a138648a4ebf44345a28121018
Merge: 194bf10 ec03da8
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 21 21:14:29 2014 +0200

    Merge branch 'master' into autopkgtest

 bin/dh_ruby_fixdepends                      | 13 +++++----
 debian/changelog                            | 14 ++++++---
 debian/control                              | 20 +++++++++++--
 debian/gem2deb.install                      |  2 +-
 lib/gem2deb/version.rb                      |  2 +-
 test/bin/wnpp-check                         |  3 ++
 test/integration/dh_ruby_fixdepends_test.rb | 45 +++++++++++++++++++++++++++++
 test/integration/gem2deb_test.rb            | 11 +++++--
 test/sample/multibinary/debian/control      |  6 ++--
 test/test_helper.rb                         |  2 +-
 10 files changed, 99 insertions(+), 19 deletions(-)

diff --cc debian/control
index 6762962,04707c5..342bfa7
--- a/debian/control
+++ b/debian/control
@@@ -15,7 -23,14 +23,15 @@@ XS-Testsuite: autopkgtes
  
  Package: gem2deb
  Architecture: all
- Depends: ruby | ruby-interpreter, ruby-all-dev (>= 1:1.9.3.4), build-essential, devscripts, debhelper (>= 7.0.50~), gem2deb-test-runner, ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+ Depends: build-essential,
+          debhelper (>= 7.0.50~),
+          devscripts,
++         gem2deb-test-runner (= ${source:Version}),
+          ruby | ruby-interpreter,
+          ruby-all-dev (>= 1:2.1.0.3~),
+          ${misc:Depends},
+          ${perl:Depends},
+          ${shlibs: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 --cc debian/gem2deb.install
index 332ebfd,6ccf45c..658f9ef
--- a/debian/gem2deb.install
+++ b/debian/gem2deb.install
@@@ -1,4 -1,3 +1,4 @@@
  bin/* /usr/bin/
+ debhelper7/* /usr/share/perl5/
 +
  lib/* /usr/lib/ruby/vendor_ruby/
- debhelper7/* /usr/share/perl5/

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