[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. debian/1.4.10-5-11-gb92c594

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 843aa34680c72714d36e415c42914deb4c6fcf57
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 17 22:15:34 2013 +0200

    refresh 0001-Do-not-require-rubygems, drop 0003-Require-rspec-core-shared_context

diff --git a/debian/patches/0001-Do-not-require-rubygems.patch b/debian/patches/0001-Do-not-require-rubygems.patch
index 17caf67..83816ff 100644
--- a/debian/patches/0001-Do-not-require-rubygems.patch
+++ b/debian/patches/0001-Do-not-require-rubygems.patch
@@ -1,5 +1,5 @@
 From: Carl Worth <cworth at debian.org>
-Date: Thu, 1 Mar 2012 13:41:38 -0800
+Last-Update: 2013-06-17
 Subject: Do not require rubygems
 
  With Debian-packaged treetop, the implementation need not require
@@ -14,11 +14,9 @@ Subject: Do not require rubygems
  spec/spec_helper.rb                        |    1 -
  6 files changed, 2 insertions(+), 9 deletions(-)
 
-diff --git a/README.md b/README.md
-index 52ea59e..e89a758 100644
 --- a/README.md
 +++ b/README.md
-@@ -31,7 +31,6 @@ Next, you start filling your grammar with rules. Each rule associates a name wit
+@@ -31,7 +31,6 @@
  The first rule becomes the *root* of the grammar, causing its expression to be matched when a parser for the grammar is fed a string. The above grammar can now be used in a Ruby program. Notice how a string matching the first rule parses successfully, but a second nonmatching string does not.
  
      # use_grammar.rb
@@ -26,8 +24,6 @@ index 52ea59e..e89a758 100644
      require 'treetop'
      Treetop.load 'my_grammar'
      # or just:
-diff --git a/bin/tt b/bin/tt
-index f0f8113..1dcf278 100755
 --- a/bin/tt
 +++ b/bin/tt
 @@ -1,6 +1,5 @@
@@ -37,8 +33,6 @@ index f0f8113..1dcf278 100755
  
  $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
  require 'treetop'
-diff --git a/doc/site.rb b/doc/site.rb
-index c65f5b1..1220624 100644
 --- a/doc/site.rb
 +++ b/doc/site.rb
 @@ -1,4 +1,3 @@
@@ -46,15 +40,13 @@ index c65f5b1..1220624 100644
  require 'erector'
  require "#{File.dirname(__FILE__)}/sitegen"
  require 'fileutils'
-@@ -109,4 +108,4 @@ class Contribute < Layout
+@@ -109,4 +108,4 @@
  end
  
  
 -Layout.generate_site
 \ No newline at end of file
 +Layout.generate_site
-diff --git a/examples/lambda_calculus/test_helper.rb b/examples/lambda_calculus/test_helper.rb
-index bfdb7ad..cbb56d4 100644
 --- a/examples/lambda_calculus/test_helper.rb
 +++ b/examples/lambda_calculus/test_helper.rb
 @@ -1,5 +1,4 @@
@@ -63,15 +55,13 @@ index bfdb7ad..cbb56d4 100644
  require 'treetop'
  
  module ParserTestHelper
-@@ -15,4 +14,4 @@ module ParserTestHelper
+@@ -15,4 +14,4 @@
      assert !result.nil?
      result
    end
 -end
 \ No newline at end of file
 +end
-diff --git a/lib/treetop/bootstrap_gen_1_metagrammar.rb b/lib/treetop/bootstrap_gen_1_metagrammar.rb
-index eeea9ab..e86a421 100644
 --- a/lib/treetop/bootstrap_gen_1_metagrammar.rb
 +++ b/lib/treetop/bootstrap_gen_1_metagrammar.rb
 @@ -1,8 +1,6 @@
@@ -83,12 +73,10 @@ index eeea9ab..e86a421 100644
  TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP = '>= 1.1.5'
  
  # Loading trusted version of Treetop to compile the compiler
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 8870005..450e5cf 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -1,4 +1,3 @@
 -require 'rubygems'
  require 'benchmark'
  require 'rspec'
- require 'polyglot'
+ require 'rspec/core/shared_context'
diff --git a/debian/patches/0003-Require-rspec-core-shared_context.patch b/debian/patches/0003-Require-rspec-core-shared_context.patch
deleted file mode 100644
index 632e914..0000000
--- a/debian/patches/0003-Require-rspec-core-shared_context.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: require rspec/core/share_context in spec/spec_helper
- rspec/core/share_context.rb is not required internally by
- rspec/core, in version 2.8 and later.
-Author: Jason Webster
-Origin: upstream, https://github.com/jasonwebster/treetop/commit/754aa988cf3a16cbb5606fffa1b1ea42c2d3e1a4
-Forwarded: not-needed
-Applied-Upstream: https://github.com/jasonwebster/treetop/commit/754aa988cf3a16cbb5606fffa1b1ea42c2d3e1a4
-Reviewed-by: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2012-03-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,5 +1,6 @@
- require 'benchmark'
- require 'rspec'
-+require 'rspec/core/shared_context'
- require 'polyglot'
- 
- $LOAD_PATH.unshift File.expand_path('../../lib')
diff --git a/debian/patches/series b/debian/patches/series
index 2b6cd61..04924e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Do-not-require-rubygems.patch
 0002-Add-a-tt-manual-page.patch
-0003-Require-rspec-core-shared_context.patch

-- 
ruby-treetop.git