This patch contains all the Debian-specific changes mixed together. To review
them separately, please inspect the VCS history at
http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-gherkin.git;a=summary

In special, the branch called "for-upstream" contains commits that are supposed
to be sent to the original developers. Commits that are not in that branch are
probably Debian-specific and you do not need to care about those.
--- ruby-gherkin-2.4.6.orig/spec/spec_helper.rb
+++ ruby-gherkin-2.4.6/spec/spec_helper.rb
@@ -1,13 +1,8 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-
 require 'rspec'
 require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
-require 'gherkin/java_libs'
 require 'gherkin/shared/bom_group'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'
--- ruby-gherkin-2.4.6.orig/spec/gherkin/json_parser_spec.rb
+++ ruby-gherkin-2.4.6/spec/gherkin/json_parser_spec.rb
@@ -1,5 +1,4 @@
 #encoding: utf-8
-require 'ap'
 require 'spec_helper'
 require 'gherkin/json_parser'
 require 'gherkin/formatter/json_formatter'
