[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. debian/1.4.10-2-2-gbe3a3bd

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 7314332db723141d52c39e5d2680b0ff19ed4769
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Mar 30 01:30:26 2012 +0200

    Import upstream commit to require rspec/core/shared_context (Closes: #665251)

diff --git a/debian/patches/0003-Require-rspec-core-shared_context.patch b/debian/patches/0003-Require-rspec-core-shared_context.patch
new file mode 100644
index 0000000..632e914
--- /dev/null
+++ b/debian/patches/0003-Require-rspec-core-shared_context.patch
@@ -0,0 +1,20 @@
+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 04924e2..2b6cd61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Do-not-require-rubygems.patch
 0002-Add-a-tt-manual-page.patch
+0003-Require-rspec-core-shared_context.patch

-- 
ruby-treetop.git