[DRE-commits] [nanoc] 10/21: refresh patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit 6a683b423db1b072d1a361009a97a4c6069c15e9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jan 4 23:07:31 2017 +0100

    refresh patches
---
 debian/patches/filter_out_nil_gemspec.patch |  4 +--
 debian/patches/no_vcr.patch                 | 42 ++++++++++++++++++++++++++++-
 debian/patches/skip_tests_autopkgtest.patch |  9 +++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/debian/patches/filter_out_nil_gemspec.patch b/debian/patches/filter_out_nil_gemspec.patch
index dee4319..e7bbc2b 100644
--- a/debian/patches/filter_out_nil_gemspec.patch
+++ b/debian/patches/filter_out_nil_gemspec.patch
@@ -4,11 +4,11 @@ Description: filter out nil Gem specifications
  selecting explicitly the non nil ones fixes the problem for now
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
-Last-Update: 2016-03-02
+Last-Update: 2017-01-04
 
 --- a/lib/nanoc/cli/error_handler.rb
 +++ b/lib/nanoc/cli/error_handler.rb
-@@ -169,7 +169,7 @@
+@@ -164,7 +164,7 @@
      # @return [Hash<String, Array>] A hash containing the gem names as keys and gem versions as value
      def gems_and_versions
        gems = {}
diff --git a/debian/patches/no_vcr.patch b/debian/patches/no_vcr.patch
index 35db8eb..32ccc71 100644
--- a/debian/patches/no_vcr.patch
+++ b/debian/patches/no_vcr.patch
@@ -4,7 +4,7 @@ Description: ruby-vcr is not yet available in Debian archive
 Author: Cédric Boutillier <boutil at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695195
 Forwarded: not-needed
-Last-Update: 2016-02-19
+Last-Update: 2017-01-04
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
@@ -26,3 +26,43 @@ Last-Update: 2016-02-19
  require 'nanoc'
  require 'nanoc/cli'
  
+--- a/test/checking/checks/test_css.rb
++++ b/test/checking/checks/test_css.rb
+@@ -1,7 +1,7 @@
+ require 'helper'
+ 
+ class Nanoc::Checking::Checks::CSSTest < Nanoc::TestCase
+-  def test_run_ok
++  def _test_run_ok
+     VCR.use_cassette('css_run_ok') do
+       with_site do |site|
+         # Create files
+@@ -19,7 +19,7 @@
+     end
+   end
+ 
+-  def test_run_error
++  def _test_run_error
+     VCR.use_cassette('css_run_error') do
+       with_site do |site|
+         # Create files
+@@ -42,7 +42,7 @@
+     end
+   end
+ 
+-  def test_run_parse_error
++  def _test_run_parse_error
+     VCR.use_cassette('css_run_parse_error') do
+       with_site do |site|
+         # Create files
+--- a/test/checking/checks/test_html.rb
++++ b/test/checking/checks/test_html.rb
+@@ -25,7 +25,7 @@
+     end
+   end
+ 
+-  def test_run_error
++  def _test_run_error
+     VCR.use_cassette('html_run_error') do
+       with_site do |site|
+         # Create files
diff --git a/debian/patches/skip_tests_autopkgtest.patch b/debian/patches/skip_tests_autopkgtest.patch
index 4882e8f..7f2d4d4 100644
--- a/debian/patches/skip_tests_autopkgtest.patch
+++ b/debian/patches/skip_tests_autopkgtest.patch
@@ -42,3 +42,12 @@ Last-Update: 2016-12-29
    end
 -end
 +end unless ENV["AUTOPKGTEST_TMP"]
+--- a/test/test_gem.rb
++++ b/test/test_gem.rb
+@@ -24,5 +24,5 @@
+     assert_match(/^nanoc-.*\.gem$/, diff.to_a[0])
+   ensure
+     Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
+-  end
++  end unless ENV["AUTOPKGTEST_TMP"]
+ end

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