[DRE-commits] [ruby-graphviz] 04/07: drop fix-ruby2gv.patch, remove-rubygems-require.patch, add clean_test_helper.patc

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

commit b9a8669475adaf6f91ad6819905d9db90b9c7762
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jun 7 21:55:37 2016 +0200

    drop fix-ruby2gv.patch, remove-rubygems-require.patch, add clean_test_helper.patc
---
 debian/patches/clean_test_helper.patch       | 21 ++++++++++++
 debian/patches/fix-ruby2gv.patch             | 20 ------------
 debian/patches/remove-rubygems-require.patch | 48 ----------------------------
 debian/patches/series                        |  3 +-
 4 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/debian/patches/clean_test_helper.patch b/debian/patches/clean_test_helper.patch
new file mode 100644
index 0000000..f2604c9
--- /dev/null
+++ b/debian/patches/clean_test_helper.patch
@@ -0,0 +1,21 @@
+Description: no bundler, no loadpath modification, load open3
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2016-06-07
+
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,12 +1,7 @@
+-require 'rubygems'
+-require 'bundler/setup'
+ require 'test/unit'
+ require 'pathname'
++require 'open3'
+ 
+-cur = Pathname.new(File.expand_path("..", __FILE__))
+-lib = cur.join('..', 'lib')
+-
+-$LOAD_PATH.unshift(lib.to_s, cur.to_s)
+ require 'graphviz'
+ require 'graphviz/theory'
+ require 'graphviz/math/matrix'
diff --git a/debian/patches/fix-ruby2gv.patch b/debian/patches/fix-ruby2gv.patch
deleted file mode 100644
index 3e31d44..0000000
--- a/debian/patches/fix-ruby2gv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Cédric Boutillier https://github.com/boutil
-Subject: Fix for ruby2gv failure
-
-line 119 of bin/ruby2gv, replace each by each_line.
-
-Origin: upstream, https://github.com/glejeune/Ruby-Graphviz/issues/56#issuecomment-9819218
-Bug: https://github.com/glejeune/Ruby-Graphviz/issues/56
-Bug-Debian: http://bugs.debian.org/676393
-
---- a/bin/ruby2gv
-+++ b/bin/ruby2gv
-@@ -116,7 +116,7 @@
-     xData = fp.read()
-     fp.close
- 
--    xData.each do |xLine|
-+    xData.each_line do |xLine|
-       if lxLineMatch = REQUIRE.match( xLine )
-         xRequiredLib = lxLineMatch[2].gsub( /\.(rb|so)$/, "" )
- 
diff --git a/debian/patches/remove-rubygems-require.patch b/debian/patches/remove-rubygems-require.patch
deleted file mode 100644
index fa0c601..0000000
--- a/debian/patches/remove-rubygems-require.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: remove require 'rubygems'
-
-Gems should not require rubygems to work.
-
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-Update: 2012-10-26
-
---- a/lib/graphviz/family_tree.rb
-+++ b/lib/graphviz/family_tree.rb
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- 
--require 'rubygems'
-+# Libs should not require rubygems, commenting out
-+# require 'rubygems'
- require 'graphviz'
- require 'graphviz/family_tree/generation'
- require 'graphviz/family_tree/person'
---- a/lib/graphviz/family_tree/person.rb
-+++ b/lib/graphviz/family_tree/person.rb
-@@ -1,4 +1,5 @@
--require 'rubygems'
-+# Libs should not require rubygems, commenting out
-+# require 'rubygems'
- require 'graphviz'
- 
- class GraphViz
---- a/lib/graphviz/nothugly.rb
-+++ b/lib/graphviz/nothugly.rb
-@@ -7,7 +7,8 @@
- # Earl Cummings, Michael Kennedy (Graphviz 2.20.2 compatibility, bug fixes,
- # testing, lots of gradients)
- 
--require 'rubygems'
-+# Libs should not require rubygmes, commenting out
-+# require 'rubygems'
- begin
-    require 'xml/xslt'
-    XSLT_METHOD = :xml_xslt_transform
---- a/test/support.rb
-+++ b/test/support.rb
-@@ -1,4 +1,5 @@
--require 'rubygems'
-+# comment out require rubygems line
-+# require 'rubygems'
- require 'test/unit'
- begin
- require 'ruby-debug'
diff --git a/debian/patches/series b/debian/patches/series
index a64828d..9a89241 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-ruby2gv.patch
-remove-rubygems-require.patch
+clean_test_helper.patch

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