[DRE-commits] [ruby-bogus] 07/07: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-bogus

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-bogus.

commit 4430d360c403e85761776fecd197fef6de6f5d49
Merge: b8e7216 0f68168
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Mar 13 21:42:04 2016 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-bogus

 debian/changelog                                   | 10 +++++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 13 ++++++-----
 debian/patches/clean_spec_helper.patch             | 25 +++++++++++++++++-----
 .../remove_relative_import_from_tests.patch        | 22 +++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  2 ++
 7 files changed, 62 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index a9aabe0,d7bf830..56810c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,13 +1,24 @@@
 -ruby-bogus (0.1.6-1) unstable; urgency=medium
++ruby-bogus (0.1.6-2) UNRELEASED; urgency=medium
+ 
+   * Team upload.
 -  * New upstream release
+   * Create patch to remove relative import in clean_ruby_spec.rb
+   * Update clean_spec_helper.patch for the new upstream code
+   * debian/rules: Add check-dependencies command
+ 
+  -- Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>  Mon, 07 Mar 2016 11:29:11 -0300
+ 
 +ruby-bogus (0.1.6-1) unstable; urgency=medium
 +
 +  * Imported Upstream version 0.1.6
 +    + test suite ported to RSpec 3 (Closes: #795004)
 +  * Update build-dependencies: add a version for ruby-rspec >=3, drop ruby-rr
 +  * Update clean_spec_helper.patch
 +  * Update packaging with dh-make-ruby -w
 +    + Bump Standards-Version to 3.9.6 (no changes needed)
 +
 + -- Cédric Boutillier <boutil at debian.org>  Sun, 09 Aug 2015 23:33:37 +0200
 +
++
  ruby-bogus (0.1.5-3) unstable; urgency=medium
  
    * Do not build-depend on ruby-activerecord-nulldb-adapter (not in Jessie)
diff --cc debian/control
index e6cb2e9,451dbf0..cf7bbe1
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,16 +3,15 @@@ Section: rub
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders: Cédric Boutillier <boutil at debian.org>
- Build-Depends: debhelper (>= 7.0.50~),
+ Build-Depends: debhelper (>= 9~),
                 gem2deb,
-                ruby-dependor (>= 0.0.4),
+                ruby-dependor,
                 ruby-minitest,
-                ruby-rspec (>= 3~)
- Standards-Version: 3.9.6
- Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-bogus.git
 -               ruby-rr,
+                ruby-rspec
+ Standards-Version: 3.9.7
+ Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-bogus.git
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-bogus.git
  Homepage: https://github.com/psyho/bogus
- Testsuite: autopkgtest-pkg-ruby
  XS-Ruby-Versions: all
  
  Package: ruby-bogus
diff --cc debian/patches/clean_spec_helper.patch
index f784fe8,d680655..8d0beec
--- a/debian/patches/clean_spec_helper.patch
+++ b/debian/patches/clean_spec_helper.patch
@@@ -2,11 -2,13 +2,13 @@@ Description: remove simplecov/coverall
   running test coverage is not needed when building the package
  Author: Cédric Boutillier <boutil at debian.org>
  Forwarded: not-needed
 -last-Update: 2014-06-22
 +last-Update: 2015-08-09
  
- --- a/spec/spec_helper.rb
- +++ b/spec/spec_helper.rb
- @@ -1,18 +1,3 @@
+ Index: ruby-bogus/spec/spec_helper.rb
+ ===================================================================
+ --- ruby-bogus.orig/spec/spec_helper.rb	2016-03-07 11:39:23.479058684 -0300
+ +++ ruby-bogus/spec/spec_helper.rb	2016-03-07 11:39:54.494886958 -0300
+ @@ -1,17 +1,17 @@
  -require 'simplecov'
  -begin
  -  require "coveralls"
diff --cc debian/rules
index 3d5b7e2,dd595e3..1bdffeb
--- a/debian/rules
+++ b/debian/rules
@@@ -10,10 -10,9 +10,12 @@@
  #
  # 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
  

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