[DRE-commits] [ruby-fftw3] 02/03: Add patch: Drop RubyGems Depend

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-fftw3.

commit bf4886a66fdcc722eff13e4a3cb81893bbbb6cc3
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Sep 4 15:53:19 2015 +0900

    Add patch: Drop RubyGems Depend
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-FixLibraryPath.patch        | 22 ----------------
 debian/patches/0001-RefactTestCases.patch       | 11 +++++---
 debian/patches/0002-Drop-RubyGems-Depends.patch | 35 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/debian/patches/0001-FixLibraryPath.patch b/debian/patches/0001-FixLibraryPath.patch
deleted file mode 100644
index 587637e..0000000
--- a/debian/patches/0001-FixLibraryPath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Tue, 15 Oct 2013 17:00:05 +0900
-Subject: FixLibraryPath
-
----
- extconf.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/extconf.rb b/extconf.rb
-index 1607ea7..8e53119 100644
---- a/extconf.rb
-+++ b/extconf.rb
-@@ -1,7 +1,7 @@
- require "mkmf"
- 
--dir_config('narray',$sitearchdir,$sitearchdir)
--dir_config('fftw3','/usr/local')
-+dir_config('narray',$vendorarchdir,$vendorarchdir)
-+dir_config('fftw3','/usr')
- 
- if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
-    print <<-EOS
diff --git a/debian/patches/0001-RefactTestCases.patch b/debian/patches/0001-RefactTestCases.patch
index ccd326c..a3f3f23 100644
--- a/debian/patches/0001-RefactTestCases.patch
+++ b/debian/patches/0001-RefactTestCases.patch
@@ -3,12 +3,14 @@ Date: Tue, 15 Oct 2013 17:00:05 +0900
 Subject: RefactTestCases
 
 ---
- test/complexFFT.rb | 71 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 36 insertions(+), 35 deletions(-)
+ test/complexFFT.rb | 69 +++++++++++++++++++++++++++---------------------------
+ 1 file changed, 35 insertions(+), 34 deletions(-)
 
+diff --git a/test/complexFFT.rb b/test/complexFFT.rb
+index e8dde6d..b7e28d5 100644
 --- a/test/complexFFT.rb
 +++ b/test/complexFFT.rb
-@@ -3,41 +3,42 @@
+@@ -3,41 +3,42 @@ require "rubygems"
  rescue LoadError
  end
  require "narray"  # This line is needed for rake test when making a gem package.
@@ -50,8 +52,9 @@ Subject: RefactTestCases
 -p( fc=FFTW3.fft(na, -1, 1) / na.shape[1] )
 -p( fc=FFTW3.fft(na, -1, 0,1,2)  / (na.shape[0]*na.shape[1]*na.shape[2]) )
 -p FFTW3.fft(fc, 1, 0,1,2).real
+-
 +class ComplexTest < Test::Unit::TestCase
- 
++
 +  def setup
 +    @na_double = NArray.float(8,4).fill(1.0)
 +    @na_single = NArray.sfloat(8,4).indgen!
diff --git a/debian/patches/0002-Drop-RubyGems-Depends.patch b/debian/patches/0002-Drop-RubyGems-Depends.patch
new file mode 100644
index 0000000..16d91d6
--- /dev/null
+++ b/debian/patches/0002-Drop-RubyGems-Depends.patch
@@ -0,0 +1,35 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 4 Sep 2015 15:52:55 +0900
+Subject: Drop RubyGems Depends
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ lib/numru/fftw3.rb | 5 -----
+ test/complexFFT.rb | 4 ----
+ 2 files changed, 9 deletions(-)
+
+diff --git a/lib/numru/fftw3.rb b/lib/numru/fftw3.rb
+index 84f48bb..ebb6abb 100644
+--- a/lib/numru/fftw3.rb
++++ b/lib/numru/fftw3.rb
+@@ -1,8 +1,3 @@
+-begin
+-  require "rubygems"
+-rescue LoadError
+-end
+-
+ require "numru/fftw3/version"
+ require "numru/fftw3/fftw3"
+ 
+diff --git a/test/complexFFT.rb b/test/complexFFT.rb
+index b7e28d5..9067f70 100644
+--- a/test/complexFFT.rb
++++ b/test/complexFFT.rb
+@@ -1,7 +1,3 @@
+-begin
+-require "rubygems"
+-rescue LoadError
+-end
+ require "narray"  # This line is needed for rake test when making a gem package.
+ require "test/unit"
+ require "narray"
diff --git a/debian/patches/series b/debian/patches/series
index c7c1fef..47b590e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-RefactTestCases.patch
+0002-Drop-RubyGems-Depends.patch

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