[DRE-commits] [ruby-nokogiri] 04/07: Refresh patches and drop 0005-skip-test-incompatible-with-libxml2-from-Debian.patch (upstream also added a skip stanza)
Lucas Nussbaum
lucas at moszumanska.debian.org
Thu Jul 6 20:28:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ruby-nokogiri.
commit 7e2892a9796087e8e7dde54ba9f2dd9cefcb43ed
Author: Lucas Nussbaum <lucas at debian.org>
Date: Thu Jul 6 20:00:20 2017 +0200
Refresh patches and drop 0005-skip-test-incompatible-with-libxml2-from-Debian.patch (upstream also added a skip stanza)
---
...-warning-about-the-version-of-libxml-used.patch | 4 +-
.../0002-deactivate-reader_blocking-test.patch | 2 -
.../0003-Remove-dependency-on-mini_portile2.patch | 58 ++++++++++------------
...est-incompatible-with-libxml2-from-Debian.patch | 20 --------
debian/patches/series | 1 -
5 files changed, 28 insertions(+), 57 deletions(-)
diff --git a/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch b/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch
index 35915a6..a6c8d43 100644
--- a/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch
+++ b/debian/patches/0001-Remove-warning-about-the-version-of-libxml-used.patch
@@ -7,11 +7,9 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
lib/nokogiri/version.rb | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
-diff --git a/lib/nokogiri/version.rb b/lib/nokogiri/version.rb
-index ba84a31..73b0313 100644
--- a/lib/nokogiri/version.rb
+++ b/lib/nokogiri/version.rb
-@@ -36,11 +36,7 @@ module Nokogiri
+@@ -37,11 +37,7 @@ module Nokogiri
def warnings
return [] unless libxml2?
diff --git a/debian/patches/0002-deactivate-reader_blocking-test.patch b/debian/patches/0002-deactivate-reader_blocking-test.patch
index d90c4ed..a79840c 100644
--- a/debian/patches/0002-deactivate-reader_blocking-test.patch
+++ b/debian/patches/0002-deactivate-reader_blocking-test.patch
@@ -9,8 +9,6 @@ https://github.com/sparklemotion/nokogiri/issues/965
test/xml/test_reader.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/test/xml/test_reader.rb b/test/xml/test_reader.rb
-index c310ad3..cf825ed 100644
--- a/test/xml/test_reader.rb
+++ b/test/xml/test_reader.rb
@@ -38,7 +38,7 @@ module Nokogiri
diff --git a/debian/patches/0003-Remove-dependency-on-mini_portile2.patch b/debian/patches/0003-Remove-dependency-on-mini_portile2.patch
index f9c06ce..1e3f22d 100644
--- a/debian/patches/0003-Remove-dependency-on-mini_portile2.patch
+++ b/debian/patches/0003-Remove-dependency-on-mini_portile2.patch
@@ -10,48 +10,44 @@ Signed-off-by: Antonio Terceiro <terceiro at debian.org>
nokogiri.gemspec | 3 ---
2 files changed, 9 deletions(-)
-diff --git a/Rakefile b/Rakefile
-index 49de8b0..e9ddfee 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -125,12 +125,6 @@ HOE = Hoe.spec 'nokogiri' do
- ]
- self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
-
-- unless java?
-- self.extra_deps += [
-- ["mini_portile2", "~> 2.1.0"], # keep version in sync with extconf.rb
-- ]
-- end
--
- self.extra_dev_deps += [
- ["hoe-bundler", "~> 1.2.0"],
- ["hoe-debugging", "~> 1.2.1"],
-diff --git a/nokogiri.gemspec b/nokogiri.gemspec
-index 3c418ef..8bba7af 100644
--- 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"])
+@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
+ s.add_development_dependency(%q<hoe-debugging>, ["~> 1.3.0"])
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_runtime_dependency(%q<mini_portile2>, ["~> 2.2.0"])
s.add_development_dependency(%q<minitest>, ["~> 5.8.4"])
s.add_development_dependency(%q<racc>, ["~> 1.4.14"])
- s.add_development_dependency(%q<rake>, ["~> 10.5.0"])
-@@ -47,7 +46,6 @@ Gem::Specification.new do |s|
- s.add_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
+ s.add_development_dependency(%q<rake>, ["~> 12.0"])
+@@ -49,7 +48,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<hoe-debugging>, ["~> 1.3.0"])
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<mini_portile2>, ["~> 2.2.0"])
s.add_dependency(%q<minitest>, ["~> 5.8.4"])
s.add_dependency(%q<racc>, ["~> 1.4.14"])
- s.add_dependency(%q<rake>, ["~> 10.5.0"])
-@@ -62,7 +60,6 @@ Gem::Specification.new do |s|
- s.add_dependency(%q<hoe-debugging>, ["~> 1.2.1"])
+ s.add_dependency(%q<rake>, ["~> 12.0"])
+@@ -65,7 +63,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<hoe-debugging>, ["~> 1.3.0"])
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<mini_portile2>, ["~> 2.2.0"])
s.add_dependency(%q<minitest>, ["~> 5.8.4"])
s.add_dependency(%q<racc>, ["~> 1.4.14"])
- s.add_dependency(%q<rake>, ["~> 10.5.0"])
+ s.add_dependency(%q<rake>, ["~> 12.0"])
+--- a/Rakefile
++++ b/Rakefile
+@@ -123,12 +123,6 @@ HOE = Hoe.spec 'nokogiri' do
+ ]
+ self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
+
+- unless java?
+- self.extra_deps += [
+- ["mini_portile2", "~> 2.2.0"], # keep version in sync with extconf.rb
+- ]
+- end
+-
+ self.extra_dev_deps += [
+ ["hoe-bundler", "~> 1.2.0"],
+ ["hoe-debugging", "~> 1.3.0"],
diff --git a/debian/patches/0005-skip-test-incompatible-with-libxml2-from-Debian.patch b/debian/patches/0005-skip-test-incompatible-with-libxml2-from-Debian.patch
deleted file mode 100644
index 3104461..0000000
--- a/debian/patches/0005-skip-test-incompatible-with-libxml2-from-Debian.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Mon, 14 Nov 2016 12:21:01 -0200
-Subject: skip test incompatible with libxml2 from Debian
-
----
- test/xml/test_node.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/xml/test_node.rb b/test/xml/test_node.rb
-index a8a306a..f9562b2 100644
---- a/test/xml/test_node.rb
-+++ b/test/xml/test_node.rb
-@@ -326,6 +326,7 @@ module Nokogiri
- end
-
- def test_document_compare
-+ skip('Does not work against the libxml2 in Debian')
- nodes = @xml.xpath('//employee')
- assert_equal(-1, (nodes.first <=> @xml))
- end
diff --git a/debian/patches/series b/debian/patches/series
index 7ca61d7..d3f8d81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
0002-deactivate-reader_blocking-test.patch
0003-Remove-dependency-on-mini_portile2.patch
0004-Always-use-system-libraries.patch
-0005-skip-test-incompatible-with-libxml2-from-Debian.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