[DRE-commits] [nanoc] 03/03: refresh patches

Cédric Boutillier boutil at moszumanska.debian.org
Thu Jul 6 21:11:18 UTC 2017 

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

boutil pushed a commit to branch experimental
in repository nanoc.

commit 89a54acd5b10ff4f0ab996cf4e7691abed3bb74e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun May 14 11:57:51 2017 +0200

    refresh patches
---
 debian/patches/encoding.patch               | 14 ++++++++++----
 debian/patches/filter_out_nil_gemspec.patch |  4 ++--
 debian/patches/no_simplecov.patch           |  9 ++++++---
 debian/patches/no_vcr.patch                 | 12 ++++++------
 debian/patches/no_w3c_validators.patch      |  4 ++--
 debian/patches/skip_tests_autopkgtest.patch | 12 ++++++------
 6 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/debian/patches/encoding.patch b/debian/patches/encoding.patch
index 573f126..ddd8b1b 100644
--- a/debian/patches/encoding.patch
+++ b/debian/patches/encoding.patch
@@ -1,11 +1,13 @@
 Description: force encoding to UTF-8 to fix test in clean environment
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2017-01-05
+Last-Update: 2017-05-14
 Forwarded: not-needed
 
 --- a/test/cli/commands/test_create_site.rb
 +++ b/test/cli/commands/test_create_site.rb
-@@ -1,3 +1,5 @@
+@@ -1,5 +1,7 @@
+ # frozen_string_literal: true
+ 
 +Encoding.default_external="UTF-8" if defined? Encoding
 +
  require 'helper'
@@ -13,7 +15,9 @@ Forwarded: not-needed
  class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
 --- a/spec/contributors_spec.rb
 +++ b/spec/contributors_spec.rb
-@@ -1,3 +1,5 @@
+@@ -1,5 +1,7 @@
+ # frozen_string_literal: true
+ 
 +Encoding.default_external="UTF-8" if defined? Encoding
 +
  describe 'list of contributors in README', chdir: false do
@@ -21,7 +25,9 @@ Forwarded: not-needed
      File.readlines('README.md').last.chomp("\n").split(', ')
 --- a/spec/nanoc/cli/commands/shell_spec.rb
 +++ b/spec/nanoc/cli/commands/shell_spec.rb
-@@ -1,3 +1,5 @@
+@@ -1,5 +1,7 @@
+ # frozen_string_literal: true
+ 
 +Encoding.default_external="UTF-8" if defined? Encoding
 +
  describe Nanoc::CLI::Commands::Shell, site: true, stdio: true do
diff --git a/debian/patches/filter_out_nil_gemspec.patch b/debian/patches/filter_out_nil_gemspec.patch
index e7bbc2b..801f227 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: 2017-01-04
+Last-Update: 2017-05-14
 
 --- a/lib/nanoc/cli/error_handler.rb
 +++ b/lib/nanoc/cli/error_handler.rb
-@@ -164,7 +164,7 @@
+@@ -166,7 +166,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_simplecov.patch b/debian/patches/no_simplecov.patch
index 8cc7373..e7fc909 100644
--- a/debian/patches/no_simplecov.patch
+++ b/debian/patches/no_simplecov.patch
@@ -1,11 +1,13 @@
 Description: do not load simplecov in tests
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not needed
-Last-Update: 2017-04-22
+Last-Update: 2017-05-14
 
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,9 +1,3 @@
+@@ -1,11 +1,5 @@
+ # frozen_string_literal: true
+ 
 -require 'simplecov'
 -SimpleCov.start
 -
@@ -17,7 +19,8 @@ Last-Update: 2017-04-22
  require 'nanoc/spec'
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,11 +1,5 @@
+@@ -2,12 +2,6 @@
+ 
  $VERBOSE = false
  
 -require 'simplecov'
diff --git a/debian/patches/no_vcr.patch b/debian/patches/no_vcr.patch
index 121e491..e6fdcd8 100644
--- a/debian/patches/no_vcr.patch
+++ b/debian/patches/no_vcr.patch
@@ -4,11 +4,11 @@ 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: 2017-04-22
+Last-Update: 2017-05-14
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -8,17 +8,11 @@
+@@ -10,17 +10,11 @@
  
  require 'minitest/autorun'
  require 'mocha/setup'
@@ -28,7 +28,7 @@ Last-Update: 2017-04-22
  
 --- a/test/checking/checks/test_css.rb
 +++ b/test/checking/checks/test_css.rb
-@@ -1,7 +1,7 @@
+@@ -3,7 +3,7 @@
  require 'helper'
  
  class Nanoc::Checking::Checks::CSSTest < Nanoc::TestCase
@@ -37,7 +37,7 @@ Last-Update: 2017-04-22
      VCR.use_cassette('css_run_ok') do
        with_site do |site|
          # Create files
-@@ -19,7 +19,7 @@
+@@ -21,7 +21,7 @@
      end
    end
  
@@ -46,7 +46,7 @@ Last-Update: 2017-04-22
      VCR.use_cassette('css_run_error') do
        with_site do |site|
          # Create files
-@@ -42,7 +42,7 @@
+@@ -44,7 +44,7 @@
      end
    end
  
@@ -57,7 +57,7 @@ Last-Update: 2017-04-22
          # Create files
 --- a/test/checking/checks/test_html.rb
 +++ b/test/checking/checks/test_html.rb
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
      end
    end
  
diff --git a/debian/patches/no_w3c_validators.patch b/debian/patches/no_w3c_validators.patch
index c849ddd..1a1f97e 100644
--- a/debian/patches/no_w3c_validators.patch
+++ b/debian/patches/no_w3c_validators.patch
@@ -1,11 +1,11 @@
 Description: disable test requiring w3c_validators
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2017-04-22
+Last-Update: 2017-05-14
 
 --- a/test/checking/checks/test_html.rb
 +++ b/test/checking/checks/test_html.rb
-@@ -1,7 +1,7 @@
+@@ -3,7 +3,7 @@
  require 'helper'
  
  class Nanoc::Checking::Checks::HTMLTest < Nanoc::TestCase
diff --git a/debian/patches/skip_tests_autopkgtest.patch b/debian/patches/skip_tests_autopkgtest.patch
index 7f2d4d4..0755b7d 100644
--- a/debian/patches/skip_tests_autopkgtest.patch
+++ b/debian/patches/skip_tests_autopkgtest.patch
@@ -1,11 +1,11 @@
 Description: skip tests which are failing in autopkgtest because of missing context
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2016-12-29
+Last-Update: 2017-05-14
 
 --- a/test/base/test_context.rb
 +++ b/test/base/test_context.rb
-@@ -23,7 +23,7 @@
+@@ -25,7 +25,7 @@
  
      # Run
      assert_examples_correct 'Nanoc::Int::Context#initialize'
@@ -16,7 +16,7 @@ Last-Update: 2016-12-29
      context = Nanoc::Int::Context.new({})
 --- a/test/base/test_directed_graph.rb
 +++ b/test/base/test_directed_graph.rb
-@@ -326,5 +326,5 @@
+@@ -328,5 +328,5 @@
    def test_example
      YARD.parse(LIB_DIR + '/nanoc/base/entities/directed_graph.rb')
      assert_examples_correct 'Nanoc::Int::DirectedGraph'
@@ -25,7 +25,7 @@ Last-Update: 2016-12-29
  end
 --- a/test/cli/test_cli.rb
 +++ b/test/cli/test_cli.rb
-@@ -132,7 +132,7 @@
+@@ -134,7 +134,7 @@
      Nanoc::CLI.load_command_at(root_dir + '/lib/nanoc/cli/commands/create-site.rb')
    ensure
      Encoding.default_external = Encoding::UTF_8
@@ -36,7 +36,7 @@ Last-Update: 2016-12-29
      $after_setup_success = false
 --- a/test/helpers/test_link_to.rb
 +++ b/test/helpers/test_link_to.rb
-@@ -52,4 +52,4 @@
+@@ -54,4 +54,4 @@
      # Run
      assert_examples_correct 'Nanoc::Helpers::LinkTo#relative_path_to'
    end
@@ -44,7 +44,7 @@ Last-Update: 2016-12-29
 +end unless ENV["AUTOPKGTEST_TMP"]
 --- a/test/test_gem.rb
 +++ b/test/test_gem.rb
-@@ -24,5 +24,5 @@
+@@ -26,5 +26,5 @@
      assert_match(/^nanoc-.*\.gem$/, diff.to_a[0])
    ensure
      Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }

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

More information about the Pkg-ruby-extras-commits mailing list