[DRE-commits] [ruby-simplecov] 02/02: re-added dependency on ruby-simplecov-html

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-simplecov.

commit 738bdc34f2bb1f2570c586b014f521e0c884f5c0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Oct 22 18:07:26 2015 -0200

    re-added dependency on ruby-simplecov-html
    
    it will be waiting in NEW shortly
---
 debian/changelog                     |  2 ++
 debian/control                       |  2 ++
 debian/patches/ignore-simplecov-html | 52 ------------------------------------
 debian/patches/series                |  1 -
 4 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f038f26..bc1f3b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ruby-simplecov (0.10.0-2) UNRELEASED; urgency=medium
   * debian/patches/dont-mess-with-the-load-path.patch: avoid modifying the
     $LOAD_PATH. This fixes using simplecov against a local repository of a
     project that is also installed as a Debian package.
+  * drop debian/patches/ignore-simplecov-html
+    - re-added dependency on ruby-simplecov-html
 
  -- Antonio Terceiro <terceiro at debian.org>  Thu, 22 Oct 2015 17:10:45 -0200
 
diff --git a/debian/control b/debian/control
index 845ab11..ff55ad4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9~),
                ruby-shoulda,
                ruby-minitest,
                ruby-rspec,
+               ruby-simplecov-html,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-simplecov.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-simplecov.git
@@ -24,6 +25,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
          ruby-docile (>= 1.1.0),
          ruby-json (>= 1.8),
+         ruby-simplecov-html,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: code coverage for Ruby 1.9+
diff --git a/debian/patches/ignore-simplecov-html b/debian/patches/ignore-simplecov-html
deleted file mode 100644
index 496f9f1..0000000
--- a/debian/patches/ignore-simplecov-html
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Ignore simplecov-html load failured
- Break dependency cycle
-Author: Christian Hofstaedtler <zeha at debian.org>
-Last-updated: 2013-12-23
-
-
---- a/lib/simplecov/defaults.rb
-+++ b/lib/simplecov/defaults.rb
-@@ -1,6 +1,3 @@
--# Load default formatter gem
--require "simplecov-html"
--
- SimpleCov.profiles.define "root_filter" do
-   # Exclude all files outside of simplecov root
-   add_filter do |src|
-@@ -34,7 +31,7 @@ end
- 
- # Default configuration
- SimpleCov.configure do
--  formatter SimpleCov::Formatter::HTMLFormatter
-+  formatter SimpleCov::Formatter::SimpleFormatter
-   load_profile "bundler_filter"
-   # Exclude files outside of SimpleCov.root
-   load_profile "root_filter"
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -23,15 +23,6 @@ dependencies:
-   name: json
- - !ruby/object:Gem::Dependency 
-   type: :runtime
--  version_requirements: &id003 !ruby/object:Gem::Requirement 
--    requirements: 
--    - - ~>
--      - *id002
--  requirement: *id003
--  prerelease: false
--  name: simplecov-html
--- !ruby/object:Gem::Dependency 
--  type: :runtime
-   version_requirements: &id004 !ruby/object:Gem::Requirement 
-     requirements: 
-     - - ~>
---- a/simplecov.gemspec
-+++ b/simplecov.gemspec
-@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
-   gem.required_ruby_version = ">= 1.8.7"
- 
-   gem.add_dependency "json", "~> 1.8"
--  gem.add_dependency "simplecov-html", "~> 0.10.0"
-   gem.add_dependency "docile", "~> 1.1.0"
- 
-   gem.add_development_dependency "bundler", "~> 1.9"
diff --git a/debian/patches/series b/debian/patches/series
index 6278f23..3c68580 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 remove-rubygems-bundler.patch
-ignore-simplecov-html
 skip-broken-test.patch
 fix-test-suite.patch
 dont-mess-with-the-load-path.patch

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