[DRE-commits] [SCM] ruby-rack-test.git branch, master, updated. debian/0.6.1-2-3-g3cbe01c

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 3cbe01c86c989cdd9751135e885d2dc7e5b2e1a1
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Jul 9 22:10:14 2012 +0900

    Update patch handling: using gbp-pq
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/0001-Remove-Bundler-Dependencies.patch b/debian/patches/0001-Remove-Bundler-Dependencies.patch
new file mode 100644
index 0000000..d88db35
--- /dev/null
+++ b/debian/patches/0001-Remove-Bundler-Dependencies.patch
@@ -0,0 +1,24 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 9 Jul 2012 22:10:53 +0900
+Subject: Remove Bundler Dependencies
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ spec/spec_helper.rb |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 7461461..744eaf5 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,8 +1,7 @@
+ require "rubygems"
+-require "bundler/setup"
+-
+ require "rack"
+ require "rspec"
++require "sinatra"
+ 
+ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
+ 
diff --git a/debian/patches/remove_bundler b/debian/patches/remove_bundler
deleted file mode 100644
index e3fa835..0000000
--- a/debian/patches/remove_bundler
+++ /dev/null
@@ -1,12 +0,0 @@
---- ruby-rack-test-0.6.0.orig/spec/spec_helper.rb
-+++ ruby-rack-test-0.6.0/spec/spec_helper.rb
-@@ -1,8 +1,7 @@
- require "rubygems"
--require "bundler/setup"
--
- require "rack"
- require "rspec"
-+require "sinatra"
- 
- Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 579244e..b2f1fae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove_bundler
+0001-Remove-Bundler-Dependencies.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/spec/spec_helper.rb b/spec/spec_helper.rb
index 744eaf5..7461461 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,8 @@
 require "rubygems"
+require "bundler/setup"
+
 require "rack"
 require "rspec"
-require "sinatra"
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 

-- 
ruby-rack-test.git