[DRE-commits] [ruby-unf-ext] 02/07: Refresh patches

[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-unf-ext.

commit ff784128a7cfe647c8572090379f76a9b62f4945
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Jun 15 17:17:28 2015 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-Drop-Bundler-depndencies.patch      | 14 +++-----------
 debian/patches/0002-force-using-CXX-instead-of-CC.patch | 13 +------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/debian/patches/0001-Drop-Bundler-depndencies.patch b/debian/patches/0001-Drop-Bundler-depndencies.patch
index 3deea66..d1d96b9 100644
--- a/debian/patches/0001-Drop-Bundler-depndencies.patch
+++ b/debian/patches/0001-Drop-Bundler-depndencies.patch
@@ -8,12 +8,10 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  test/helper.rb |   12 ------------
  1 file changed, 12 deletions(-)
 
-diff --git a/test/helper.rb b/test/helper.rb
-index f9d75cb..20e0abd 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,18 +1,6 @@
- require 'rubygems'
+@@ -1,12 +1,3 @@
+-require 'rubygems'
 -require 'bundler'
 -begin
 -  Bundler.setup(:default, :development)
@@ -23,11 +21,5 @@ index f9d75cb..20e0abd 100644
 -  exit e.status_code
 -end
  require 'test/unit'
- require 'shoulda'
--
--$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
--$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
--$LOAD_PATH.unshift(File.dirname(__FILE__))
- require 'unf_ext'
  
- class Test::Unit::TestCase
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
diff --git a/debian/patches/0002-force-using-CXX-instead-of-CC.patch b/debian/patches/0002-force-using-CXX-instead-of-CC.patch
index e4e9ed5..44d5756 100644
--- a/debian/patches/0002-force-using-CXX-instead-of-CC.patch
+++ b/debian/patches/0002-force-using-CXX-instead-of-CC.patch
@@ -7,20 +7,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  ext/unf_ext/extconf.rb |   10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/ext/unf_ext/extconf.rb b/ext/unf_ext/extconf.rb
-index f686a4a..7dca3cd 100644
 --- a/ext/unf_ext/extconf.rb
 +++ b/ext/unf_ext/extconf.rb
-@@ -1,13 +1,17 @@
- require 'mkmf'
--have_library('stdc++')
-+CONFIG.delete('CC')
-+CONFIG['CC'] = "g++"
-+unless have_library('stdc++')
-+  $LIBS = "-lstdc++ " + $LIBS
-+end
- have_header('ruby/encoding.h')
- create_makefile 'unf_ext'
+@@ -10,9 +10,9 @@
  
  unless CONFIG['CXX']
    case CONFIG['CC']

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