[DRE-commits] [ruby-binding-of-caller] 01/05: several packaging updates

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-binding-of-caller.

commit 7c2c3b3af5a74b6d9e842d061a72af6e3f9f9da4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 29 13:51:36 2016 -0300

    several packaging updates
---
 debian/changelog        | 13 +++++++++++++
 debian/compat           |  2 +-
 debian/control          |  8 ++++----
 debian/ruby-tests.rb    |  8 +++++++-
 debian/rules            | 16 ++--------------
 debian/tests/control    |  4 ++++
 debian/tests/control.ex | 13 -------------
 7 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e152c4..1f91ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+ruby-binding-of-caller (0.7.2+debian1-3) UNRELEASED; urgency=medium
+
+  * Update packaging with a new dh-make-ruby run
+    - Bump debhelper compat level from 7 to 9
+    - Bump Standards-Version to 3.9.7; no changes needed
+    - Architecture: all → Architecture: any
+    - cleanup debian/rules
+    - removed bogus debian/tests/control.ex
+  * debian/ruby-tests.rb: fix test invocation for multiple ruby versions
+  * debian/tests/control: run ruby tests + plus a rubygems-integration test
+
+ -- Antonio Terceiro <terceiro at debian.org>  Mon, 29 Feb 2016 11:48:00 -0300
+
 ruby-binding-of-caller (0.7.2+debian1-2) unstable; urgency=medium
 
   * Team upload
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 23bd9ed..8f8025d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Pirate Praveen <praveen at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9~),
                gem2deb,
+               ruby-bacon,
                ruby-debug-inspector (>= 0.0.1),
- 	       ruby-bacon
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-binding-of-caller.git
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-binding-of-caller.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-binding-of-caller.git
 Homepage: http://github.com/banister/binding_of_caller
 Testsuite: autopkgtest-pkg-ruby
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 6d3a3d7..b2e9486 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1 +1,7 @@
-system('bacon test/test_*.rb')
+def run(cmdline)
+  puts cmdline
+  system(cmdline) || exit(1)
+end
+
+ruby = RbConfig::CONFIG['ruby_install_name']
+run("#{ruby} -S bacon test/test_*.rb")
diff --git a/debian/rules b/debian/rules
index f92cef9..42d8305 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +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=ruby2.1 ruby2.2
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
-#
-# Uncomment to check dependencies during build:
-# export GEM2DEB_TEST_RUNNER = --check-dependencies
+
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..386f700
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
+Depends: @, ruby-bacon,ruby-debug-inspector (>= 0.0.1), gem2deb-test-runner
+
+Test-Command: gem list binding_of_caller
diff --git a/debian/tests/control.ex b/debian/tests/control.ex
deleted file mode 100644
index d604201..0000000
--- a/debian/tests/control.ex
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED FILE
-#
-# As of autopkgtest 3.5, Ruby packages that use gem2deb are automatically
-# detected, and if debian/tests/control does not exist the contents below will
-# be assumed (with the exception of gem2deb being filtered out from
-# @builddeps@):
-
-Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
-Depends: @, @builddeps@, gem2deb-test-runner
-
-# if you would need to change something to the above, to that and rename this
-# file to `control`. Otherwise, you should probably delete this file
-# (recommended).

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