[DRE-commits] [foodcritic] 12/13: Refresh patches.

[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 2701ac922de4e1a27d810cf7f2f9f8fc22218578
Author: Stefano Rivera <stefanor at debian.org>
Date:   Mon Oct 13 18:12:58 2014 -0700

    Refresh patches.
---
 debian/changelog                     | 1 +
 debian/patches/system-install-layout | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2595efe..a97599b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 foodcritic (4.0.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Stefano Rivera <stefanor at debian.org>  Mon, 13 Oct 2014 18:12:30 -0700
 
diff --git a/debian/patches/system-install-layout b/debian/patches/system-install-layout
index c849bc3..8241663 100644
--- a/debian/patches/system-install-layout
+++ b/debian/patches/system-install-layout
@@ -16,12 +16,12 @@ Last-Updated: 2013-06-05
    review, status = Linter.check(cmd_line)
 --- a/lib/foodcritic/chef.rb
 +++ b/lib/foodcritic/chef.rb
-@@ -58,8 +58,13 @@
+@@ -60,8 +60,13 @@
      end
  
      def metadata_path(chef_version)
 -      File.join(File.dirname(__FILE__), '..', '..',
--        "chef_dsl_metadata/chef_#{chef_version}.json")
+-                "chef_dsl_metadata/chef_#{chef_version}.json")
 +      local_metadata = File.join(File.dirname(__FILE__), '..', '..',
 +                                 'chef_dsl_metadata')
 +      if Dir.exists? local_metadata
@@ -32,9 +32,9 @@ Last-Updated: 2013-06-05
      end
  
      def resource_check?(key, resource_type, field)
-@@ -85,9 +90,7 @@
-       # These are returned in descending version order (a newer Chef version
+@@ -87,9 +92,7 @@
        #   could break our ability to load the grammar).
+       # Grammars are not available from Chef 11+.
        def chef_search_grammars
 -        Gem.path.map do |gem_path|
 -          Dir["#{gem_path}/gems/chef-*/**/lucene.treetop"]

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