[DRE-commits] [SCM] ruby-gherkin.git branch, master, updated. debian/2.4.6-1-11-g7fd0c38

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 1cc8a0d05bb12d61d1b1b225442a3aa5aa444d82
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Jun 20 11:07:55 2012 +0200

    Convert single Debian patch to remove_bundler_rubygems_stuff.patch

diff --git a/debian/patches/remove_bundler_rubygems_stuff.patch b/debian/patches/remove_bundler_rubygems_stuff.patch
new file mode 100644
index 0000000..c5b5562
--- /dev/null
+++ b/debian/patches/remove_bundler_rubygems_stuff.patch
@@ -0,0 +1,19 @@
+Description: Remove bundler and rubygems stuff from spec_helper.rb
+ These lines are not needed on Debian systems since dependencies are available
+ as Debian packages.
+Origin: vendor
+Last-Update: 2011-06-20
+
+--- ruby-gherkin-2.11.0.orig/spec/spec_helper.rb
++++ ruby-gherkin-2.11.0/spec/spec_helper.rb
+@@ -3,10 +3,6 @@ if RUBY_VERSION =~ /1.9/
+   Encoding.default_internal = Encoding::UTF_8
+ end
+ 
+-require 'rubygems'
+-require 'bundler'
+-Bundler.setup
+-
+ require 'rspec'
+ require 'gherkin'
+ require 'stringio'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f0042d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_bundler_rubygems_stuff.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/debian/source/options b/debian/source/options
deleted file mode 100644
index 7423a2d..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-single-debian-patch

-- 
ruby-gherkin.git