[DRE-commits] [nanoc] 19/21: remove no_parallel.patch, require_net_http.patch (merged upstream)

[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 8171f678471568e9cc36bb5a0772dc051f51b8c9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 5 14:19:04 2017 +0100

    remove no_parallel.patch, require_net_http.patch (merged upstream)
---
 debian/patches/no_parallel.patch      | 16 ----------------
 debian/patches/require_net_http.patch | 13 -------------
 debian/patches/series                 |  2 --
 3 files changed, 31 deletions(-)

diff --git a/debian/patches/no_parallel.patch b/debian/patches/no_parallel.patch
deleted file mode 100644
index e85eb69..0000000
--- a/debian/patches/no_parallel.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: remove requirement on parallel gem
-Origin: https://github.com/nanoc/nanoc/pull/1051
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2017-01-04
-
---- a/lib/nanoc/checking/checks/external_links.rb
-+++ b/lib/nanoc/checking/checks/external_links.rb
-@@ -12,8 +12,6 @@
-     identifiers :external_links, :elinks
- 
-     def run
--      require 'parallel'
--
-       # Find all broken external hrefs
-       # TODO: de-duplicate this (duplicated in internal links check)
-       filenames = output_filenames.select { |f| File.extname(f) == '.html' && !excluded_file?(f) }
diff --git a/debian/patches/require_net_http.patch b/debian/patches/require_net_http.patch
deleted file mode 100644
index 769fbbb..0000000
--- a/debian/patches/require_net_http.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: add missing requirement on net/http
-Bug: https://github.com/nanoc/nanoc/issues/1050
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2017-01-04
-
---- a/spec/nanoc/cli/commands/view_spec.rb
-+++ b/spec/nanoc/cli/commands/view_spec.rb
-@@ -1,3 +1,5 @@
-+require "net/http"
-+
- describe Nanoc::CLI::Commands::View, site: true, stdio: true do
-   describe '#run' do
-     def run_nanoc_cmd(cmd)
diff --git a/debian/patches/series b/debian/patches/series
index d641aa5..92176bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,8 +7,6 @@ no_vcr.patch
 #set-load_paths-for-sass-tests.patch
 filter_out_nil_gemspec.patch
 no_w3c_validators.patch
-no_parallel.patch
 encoding.patch
 skip_tests_autopkgtest.patch
-require_net_http.patch
 no_simplecov.patch

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