[DRE-commits] [foodcritic] 03/07: 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 d648464ae137e0946f1d9025333eb763e87bc322
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sun Apr 10 16:23:29 2016 -0700

    Refresh patches.
    
    * Refresh patches.
    * Drop dont-load-minitest-autorun-in-cucumber-tests.patch, superseded
      upstream.
---
 debian/changelog                                           |  3 +++
 .../dont-load-minitest-autorun-in-cucumber-tests.patch     | 14 --------------
 debian/patches/series                                      |  1 -
 debian/patches/system-install-layout                       |  2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e13b1bd..c7ecfce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ foodcritic (6.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * No need to repack, any more.
+  * Refresh patches.
+  * Drop dont-load-minitest-autorun-in-cucumber-tests.patch, superseded
+    upstream.
 
  -- Stefano Rivera <stefanor at debian.org>  Sun, 10 Apr 2016 16:19:43 -0700
 
diff --git a/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch b/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch
deleted file mode 100644
index 7fbcd34..0000000
--- a/debian/patches/dont-load-minitest-autorun-in-cucumber-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: don't load minitest/autorun in cucumber tests
-Author: Antonio Terceiro <terceiro at debian.org>
-Bug-Debian: https://bugs.debian.org/795617
-
---- a/features/support/env.rb
-+++ b/features/support/env.rb
-@@ -10,7 +10,6 @@
- require 'aruba/cucumber'
- require 'foodcritic'
- 
--require 'minitest/autorun'
- require 'minitest/spec'
- 
- MiniTest::Spec.new(nil)
diff --git a/debian/patches/series b/debian/patches/series
index 26b80e8..6068ab0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 no-rubygems
 system-install-layout
 no-rufus-lru
-dont-load-minitest-autorun-in-cucumber-tests.patch
 autopkgtests-no-lib
diff --git a/debian/patches/system-install-layout b/debian/patches/system-install-layout
index b96a610..10c3081 100644
--- a/debian/patches/system-install-layout
+++ b/debian/patches/system-install-layout
@@ -48,7 +48,7 @@ Last-Updated: 2013-06-05
        # Create the search parser from the first loadable grammar.
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -11,4 +11,4 @@
+@@ -10,4 +10,4 @@
  require 'minitest/pride'
  require 'minitest/spec'
  

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