[DRE-commits] [ruby-nokogiri] 03/06: Refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Thu Jun 30 12:36:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ruby-nokogiri.
commit a7a32f9dbd3e42b2f4e511697cf1b7997fb87c8c
Author: Antonio Terceiro <terceiro at debian.org>
Date: Thu Jun 30 09:14:10 2016 -0300
Refresh patches
---
debian/changelog | 2 +
debian/patches/always_use_system_libraries.patch | 85 ++++++++++------------
.../patches/deactivate_test_reader_blocking.patch | 20 ++---
debian/patches/series | 1 -
4 files changed, 50 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95be066..dc3dd88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
ruby-nokogiri (1.6.8-1) UNRELEASED; urgency=medium
* Imported Upstream version 1.6.8
+ * Refresh patches
+ - skip-some-tests.patch: dropped, issues fixed upstream
-- Antonio Terceiro <terceiro at debian.org> Thu, 30 Jun 2016 08:14:43 -0300
diff --git a/debian/patches/always_use_system_libraries.patch b/debian/patches/always_use_system_libraries.patch
index 4b7e530..83c2529 100644
--- a/debian/patches/always_use_system_libraries.patch
+++ b/debian/patches/always_use_system_libraries.patch
@@ -4,11 +4,9 @@ Origin: vendor
Forwarded: not-needed
Last-Update: 2014-07-25
-Index: ruby-nokogiri/ext/nokogiri/extconf.rb
-===================================================================
---- ruby-nokogiri.orig/ext/nokogiri/extconf.rb
-+++ ruby-nokogiri/ext/nokogiri/extconf.rb
-@@ -302,7 +302,7 @@ def lib_a(ldflag)
+--- a/ext/nokogiri/extconf.rb
++++ b/ext/nokogiri/extconf.rb
+@@ -377,7 +377,7 @@ def lib_a(ldflag)
end
def using_system_libraries?
@@ -17,46 +15,39 @@ Index: ruby-nokogiri/ext/nokogiri/extconf.rb
end
#
-Index: ruby-nokogiri/Rakefile
-===================================================================
---- ruby-nokogiri.orig/Rakefile
-+++ ruby-nokogiri/Rakefile
-@@ -126,13 +126,6 @@ HOE = Hoe.spec 'nokogiri' do
- ]
- self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
+--- a/Rakefile
++++ b/Rakefile
+@@ -127,7 +127,6 @@ HOE = Hoe.spec 'nokogiri' do
-- unless java?
-- self.extra_deps += [
-- # Keep this version in sync with the one in extconf.rb !
-- ["mini_portile2", "~> 2.0.0.rc2"],
-- ]
-- end
--
- self.extra_dev_deps += [
- ["hoe-bundler", ">= 1.1"],
- ["hoe-debugging", "~> 1.2.1"],
-Index: ruby-nokogiri/metadata.yml
-===================================================================
---- ruby-nokogiri.orig/metadata.yml
-+++ ruby-nokogiri/metadata.yml
-@@ -15,20 +15,6 @@ cert_chain: []
- date: 2016-01-20 00:00:00.000000000 Z
- dependencies:
- - !ruby/object:Gem::Dependency
-- name: mini_portile2
-- requirement: !ruby/object:Gem::Requirement
-- requirements:
-- - - "~>"
-- - !ruby/object:Gem::Version
-- version: 2.0.0.rc2
-- type: :runtime
-- prerelease: false
-- version_requirements: !ruby/object:Gem::Requirement
-- requirements:
-- - - "~>"
-- - !ruby/object:Gem::Version
-- version: 2.0.0.rc2
--- !ruby/object:Gem::Dependency
- name: rdoc
- requirement: !ruby/object:Gem::Requirement
- requirements:
+ unless java?
+ self.extra_deps += [
+- ["mini_portile2", "~> 2.1.0"], # keep version in sync with extconf.rb
+ ["pkg-config", "~> 1.1.7"], # keep version in sync with extconf.rb
+ ]
+ end
+--- a/nokogiri.gemspec
++++ b/nokogiri.gemspec
+@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
+ s.add_development_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
+ s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
+ s.add_development_dependency(%q<hoe-git>, ["~> 1.6.0"])
+- s.add_runtime_dependency(%q<mini_portile2>, ["~> 2.1.0"])
+ s.add_development_dependency(%q<minitest>, ["~> 5.8.4"])
+ s.add_runtime_dependency(%q<pkg-config>, ["~> 1.1.7"])
+ s.add_development_dependency(%q<racc>, ["~> 1.4.14"])
+@@ -48,7 +47,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
+ s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
+ s.add_dependency(%q<hoe-git>, ["~> 1.6.0"])
+- s.add_dependency(%q<mini_portile2>, ["~> 2.1.0"])
+ s.add_dependency(%q<minitest>, ["~> 5.8.4"])
+ s.add_dependency(%q<pkg-config>, ["~> 1.1.7"])
+ s.add_dependency(%q<racc>, ["~> 1.4.14"])
+@@ -64,7 +62,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
+ s.add_dependency(%q<hoe-gemspec>, ["~> 1.0.0"])
+ s.add_dependency(%q<hoe-git>, ["~> 1.6.0"])
+- s.add_dependency(%q<mini_portile2>, ["~> 2.1.0"])
+ s.add_dependency(%q<minitest>, ["~> 5.8.4"])
+ s.add_dependency(%q<pkg-config>, ["~> 1.1.7"])
+ s.add_dependency(%q<racc>, ["~> 1.4.14"])
diff --git a/debian/patches/deactivate_test_reader_blocking.patch b/debian/patches/deactivate_test_reader_blocking.patch
index 681525d..47e7642 100644
--- a/debian/patches/deactivate_test_reader_blocking.patch
+++ b/debian/patches/deactivate_test_reader_blocking.patch
@@ -5,14 +5,14 @@ Bug: https://github.com/sparklemotion/nokogiri/issues/965
Last-Update: 2013-09-03
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/test_reader.rb
-+++ b/test/test_reader.rb
-@@ -36,7 +36,7 @@
+--- a/test/xml/test_reader.rb
++++ b/test/xml/test_reader.rb
+@@ -38,7 +38,7 @@ module Nokogiri
- # Issue #831
- # Make sure that the reader doesn't block reading the entire input
-- def test_reader_blocking
-+ def _test_reader_blocking
- rd, wr = IO.pipe()
- node_out = nil
- t = Thread.start do
+ # Issue #831
+ # Make sure that the reader doesn't block reading the entire input
+- def test_reader_blocking
++ def _test_reader_blocking
+ rd, wr = IO.pipe()
+ node_out = nil
+ t = Thread.start do
diff --git a/debian/patches/series b/debian/patches/series
index cc8e2e3..360827d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ remove-annoying-warning.patch
no-require-rubygems.patch
deactivate_test_reader_blocking.patch
always_use_system_libraries.patch
-skip-some-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-nokogiri.git
More information about the Pkg-ruby-extras-commits
mailing list