[DRE-commits] [foodcritic] 02/13: Drop gherkin-2.11.1 patch, and bump gherkin dependency to 2.11.7.

[Stefano Rivera]

This is an automated email from the git hooks/post-receive script.

stefanor pushed a commit to branch master
in repository foodcritic.

commit c6380307176f1c42e6bc97157cee5204d634a2b6
Author: Stefano Rivera <stefanor at debian.org>
Date:   Fri Jan 10 14:55:59 2014 +0200

    Drop gherkin-2.11.1 patch, and bump gherkin dependency to 2.11.7.
---
 debian/changelog              |  1 +
 debian/control                |  4 ++--
 debian/patches/gherkin-2.11.1 | 27 ---------------------------
 debian/patches/series         |  1 -
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94467aa..099da1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ foodcritic (3.0.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * Refresh patches.
   * Drop rak-free patch, superseded upstream.
+  * Drop gherkin-2.11.1 patch, and bump gherkin dependency to 2.11.7.
   * Switch to stable tarballs from gemwatch.
 
  -- Stefano Rivera <stefanor at debian.org>  Fri, 10 Jan 2014 14:32:32 +0200
diff --git a/debian/control b/debian/control
index 161a21b..e9e6694 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  rake,
  ruby-aruba (>= 0.4.11),
  ruby-erubis,
- ruby-gherkin (>= 2.11.1),
+ ruby-gherkin (>= 2.11.7),
  ruby-minitest (>= 3.3.0),
  ruby-nokogiri (>= 1.5.4),
  ruby-ronn,
@@ -29,7 +29,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends:
  ruby-erubis,
- ruby-gherkin (>= 2.11.1),
+ ruby-gherkin (>= 2.11.7),
  ruby-nokogiri (>= 1.5.4),
  ruby-treetop (>= 1.4.10),
  ruby-yajl (>= 1.1.0),
diff --git a/debian/patches/gherkin-2.11.1 b/debian/patches/gherkin-2.11.1
deleted file mode 100644
index b3e8967..0000000
--- a/debian/patches/gherkin-2.11.1
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Revert 5b388009 - we have gherkin 2.11.1
- This should be dropped when 2.11.7 is in the archive
-Author: Stefano Rivera <stefanor at debian.org>
-Last-Updated: 2013-06-05
-
---- a/lib/foodcritic/linter.rb
-+++ b/lib/foodcritic/linter.rb
-@@ -213,7 +213,7 @@
- 
-     # We use the Gherkin (Cucumber) syntax to specify tags.
-     def matching_tags?(tag_expr, tags)
--      Gherkin::TagExpression.new(tag_expr).evaluate(tags.map do |t|
-+      Gherkin::TagExpression.new(tag_expr).eval(tags.map do |t|
-         Gherkin::Formatter::Model::Tag.new(t, 1)
-       end)
-     end
---- a/foodcritic.gemspec
-+++ b/foodcritic.gemspec
-@@ -10,7 +10,7 @@
-   s.homepage = 'http://acrmp.github.com/foodcritic'
-   s.license = 'MIT'
-   s.executables << 'foodcritic'
--  s.add_dependency('gherkin', '~> 2.11.7')
-+  s.add_dependency('gherkin', '~> 2.11.1')
-   s.add_dependency('nokogiri', '~> 1.5.4')
-   s.add_dependency('treetop', '~> 1.4.10')
-   s.add_dependency('yajl-ruby', '~> 1.1.0')
diff --git a/debian/patches/series b/debian/patches/series
index 60dbda7..bddff5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-gherkin-2.11.1
 no-coverage
 no-rubygems
 system-install-layout

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/foodcritic.git