[DRE-commits] [ruby-simplecov-html] 01/12: restore patches

[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-html.

commit 8ba8ea23ca434bb1e696a612d7cb40ff883855f0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Oct 22 17:18:17 2015 -0200

    restore patches
---
 debian/patches/fix-paths.patch               | 26 ++++++++++++++++++++++++++
 debian/patches/remove-rubygems-bundler.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                        |  2 ++
 3 files changed, 52 insertions(+)

diff --git a/debian/patches/fix-paths.patch b/debian/patches/fix-paths.patch
new file mode 100644
index 0000000..bb7e151
--- /dev/null
+++ b/debian/patches/fix-paths.patch
@@ -0,0 +1,26 @@
+Description: Fix paths to public and views
+ public and views are installed in /usr/share/
+ and library should use those paths to access them
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Last-update: 2013-05-28
+
+--- a/lib/simplecov-html.rb
++++ b/lib/simplecov-html.rb
+@@ -15,7 +15,7 @@ module SimpleCov
+   module Formatter
+     class HTMLFormatter
+       def format(result)
+-        Dir[File.join(File.dirname(__FILE__), "../public/*")].each do |path|
++        Dir[File.join('/usr/share/ruby-simplecov-html/public/*')].each do |path|
+           FileUtils.cp_r(path, asset_output_path)
+         end
+ 
+@@ -33,7 +33,7 @@ module SimpleCov
+ 
+       # Returns the an erb instance for the template of given name
+       def template(name)
+-        ERB.new(File.read(File.join(File.dirname(__FILE__), "../views/", "#{name}.erb")))
++        ERB.new(File.read(File.join('/usr/share/ruby-simplecov-html/views/', "#{name}.erb")))
+       end
+ 
+       def output_path
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
new file mode 100644
index 0000000..ff89050
--- /dev/null
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -0,0 +1,24 @@
+Description: Remove rubygems and bundler
+ apt takes care of the required dependencies.
+ we note down dependencies in debian/control.
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Last-Updated: 2013-05-23
+
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,4 +1,3 @@
+-require "bundler/setup"
+ require "simplecov"
+ require "simplecov-html"
+ require "test/unit"
+--- a/lib/simplecov-html.rb
++++ b/lib/simplecov-html.rb
+@@ -8,7 +8,7 @@ require "time"
+ major, minor, patch =  SimpleCov::VERSION.scan(/\d+/).first(3).map(&:to_i)
+ if major < 0 || minor < 9 || patch < 0
+   fail "The version of SimpleCov you are using is too old. "\
+-  "Please update with `gem install simplecov` or `bundle update simplecov`"
++  "Please update"
+ end
+ 
+ module SimpleCov
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b7d630e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+remove-rubygems-bundler.patch
+fix-paths.patch

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