[DRE-commits] [SCM] ruby-unf-ext.git branch, master, updated. debian/0.0.4-1-4-g6c9d22e

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 6c9d22e564bc2f9676a9f1ed1b2ce8b165b2ba8d
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Jun 26 03:04:13 2012 +0900

    Build against newer gem2deb
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index 6b7ef43..71cdacc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-ruby-unf-ext (0.0.4-2) unstable; urgency=low
+ruby-unf-ext (0.0.5-2) unstable; urgency=low
+
+  * Bump build dependency on gem2deb to >= 0.3.0~
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Tue, 26 Jun 2012 03:04:13 +0900
+
+ruby-unf-ext (0.0.5-1) unstable; urgency=low
 
-  * Update patch handling: use gbp-pq
   * Imported Upstream version 0.0.5
+  * Update patch handling: use gbp-pq
+  * New patch 0002-Force-using-CXX-instead-of-CC.patch
+  * Add lintian-overrides: hardening-no-fortify-functions
 
- -- Youhei SASAKI <uwabami at gfd-dennou.org>  Wed, 13 Jun 2012 20:20:33 +0900
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Wed, 13 Jun 2012 20:21:58 +0900
 
 ruby-unf-ext (0.0.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b8264a1..663b9e2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Youhei SASAKI <uwabami at gfd-dennou.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.10~), ruby-shoulda
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-shoulda
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-unf-ext.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-unf-ext.git;a=summary
 Homepage: http://github.com/knu/ruby-unf_ext
diff --git a/debian/ruby-unf-ext.lintian-overrides b/debian/ruby-unf-ext.lintian-overrides
new file mode 100644
index 0000000..dd5cc9f
--- /dev/null
+++ b/debian/ruby-unf-ext.lintian-overrides
@@ -0,0 +1,2 @@
+ruby-unf-ext: hardening-no-fortify-functions usr/lib/ruby/vendor_ruby/1.8/x86_64-linux/unf_ext.so
+ruby-unf-ext: hardening-no-fortify-functions usr/lib/ruby/vendor_ruby/1.9.1/x86_64-linux/unf_ext.so
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'
 
 unless CONFIG['CXX']
   case CONFIG['CC']
-  when %r{((?:.*[-/])?)gcc([-0-9.]*)$}
+  when %r{((?:.*[-/])?)gcc([-0-9.]*)\s*?$}
     cxx = $1 + 'g++' + $2
-  when %r{((?:.*[-/])?)clang([-0-9.]*)$}
+  when %r{((?:.*[-/])?)clang([-0-9.]*)\s*?$}
     cxx = $1 + 'clang++' + $2
   else
     cxx = CONFIG['CC']
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'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  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

-- 
ruby-unf-ext.git