[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 5326cf9862c5fd0d9a83a9e3f6b402b7417c0082
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Jun 12 18:54:49 2012 +0900

    Update patch handling: use gbp-pq

diff --git a/debian/patches/fix_test_helper.diff b/debian/patches/0001-Drop-Bundler-depndencies.patch
similarity index 55%
rename from debian/patches/fix_test_helper.diff
rename to debian/patches/0001-Drop-Bundler-depndencies.patch
index 11f7b5a..3deea66 100644
--- a/debian/patches/fix_test_helper.diff
+++ b/debian/patches/0001-Drop-Bundler-depndencies.patch
@@ -1,14 +1,17 @@
-Description: Fix test/helper.rb
- - Remove Bundler dependencies
- - Fix Library PATH for gem2deb
- .
- ruby-unf-ext (0.0.3-1) UNRELEASED; urgency=low
- .
-   * Initial release (Closes: #nnnn)
-Author: Youhei SASAKI <uwabami at gfd-dennou.org>
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 13 Jun 2012 17:09:19 +0900
+Subject: Drop Bundler depndencies
 
---- ruby-unf-ext-0.0.3.orig/test/helper.rb
-+++ ruby-unf-ext-0.0.3/test/helper.rb
+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'
 -require 'bundler'
diff --git a/debian/patches/series b/debian/patches/series
index adc8a5a..899f284 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix_test_helper.diff
+0001-Drop-Bundler-depndencies.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
diff --git a/test/helper.rb b/test/helper.rb
index 20e0abd..f9d75cb 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,6 +1,18 @@
 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