[DRE-commits] [ruby-nokogiri] 03/05: Refresh patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-nokogiri.

commit c8e94de2f37519d9c174cf7f3ebe15db8f200244
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 14 10:57:08 2015 -0200

    Refresh patches
---
 debian/changelog                                 |  1 +
 debian/patches/always_use_system_libraries.patch | 27 +++++++++++-------------
 debian/patches/skip-some-tests.patch             |  4 ++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f4d078..495c031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-nokogiri (1.6.7-1) UNRELEASED; urgency=medium
 
   * Team upload
   * New upstream release
+    - Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 14 Dec 2015 10:51:40 -0200
 
diff --git a/debian/patches/always_use_system_libraries.patch b/debian/patches/always_use_system_libraries.patch
index 058e5ee..72d8cf1 100644
--- a/debian/patches/always_use_system_libraries.patch
+++ b/debian/patches/always_use_system_libraries.patch
@@ -6,28 +6,25 @@ Last-Update: 2014-07-25
 
 --- a/ext/nokogiri/extconf.rb
 +++ b/ext/nokogiri/extconf.rb
-@@ -290,7 +290,7 @@ def lib_a(ldflag)
+@@ -302,7 +302,7 @@ def lib_a(ldflag)
  end
  
  def using_system_libraries?
 -  arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
-+  arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']) || true
++  true
  end
  
  #
 --- a/Rakefile
 +++ b/Rakefile
-@@ -128,16 +128,6 @@ HOE = Hoe.spec 'nokogiri' do
-     # GENERATED_TOKENIZER
+@@ -126,13 +126,6 @@ HOE = Hoe.spec 'nokogiri' do
    ]
+   self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
  
 -  unless java?
 -    self.extra_deps += [
--      # this dependency locked because we're monkey-punching mini_portile.
--      # for more details, see:
--      # - https://github.com/sparklemotion/nokogiri/issues/1102
--      # - https://github.com/luislavena/mini_portile/issues/32
--      ["mini_portile",    "~> 0.6.0"],
+-      # Keep this version in sync with the one in extconf.rb !
+-      ["mini_portile2",    "~> 2.0.0.rc2"],
 -    ]
 -  end
 -
@@ -37,22 +34,22 @@ Last-Update: 2014-07-25
 --- a/metadata.yml
 +++ b/metadata.yml
 @@ -15,20 +15,6 @@ cert_chain: []
- date: 2015-11-16 00:00:00.000000000 Z
+ date: 2015-11-30 00:00:00.000000000 Z
  dependencies:
  - !ruby/object:Gem::Dependency
--  name: mini_portile
+-  name: mini_portile2
 -  requirement: !ruby/object:Gem::Requirement
 -    requirements:
--    - - ~>
+-    - - "~>"
 -      - !ruby/object:Gem::Version
--        version: 0.6.0
+-        version: 2.0.0.rc2
 -  type: :runtime
 -  prerelease: false
 -  version_requirements: !ruby/object:Gem::Requirement
 -    requirements:
--    - - ~>
+-    - - "~>"
 -      - !ruby/object:Gem::Version
--        version: 0.6.0
+-        version: 2.0.0.rc2
 -- !ruby/object:Gem::Dependency
    name: rdoc
    requirement: !ruby/object:Gem::Requirement
diff --git a/debian/patches/skip-some-tests.patch b/debian/patches/skip-some-tests.patch
index 736a981..75640d6 100644
--- a/debian/patches/skip-some-tests.patch
+++ b/debian/patches/skip-some-tests.patch
@@ -7,7 +7,7 @@ Last-Update: 2015-11-17
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/test/html/test_document.rb
 +++ b/test/html/test_document.rb
-@@ -614,6 +614,7 @@ eohtml
+@@ -619,6 +619,7 @@ eohtml
        end
  
        def test_capturing_nonparse_errors_during_document_clone
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          # see https://github.com/sparklemotion/nokogiri/issues/1196 for background
          original = Nokogiri::HTML.parse("<div id='unique'></div><div id='unique'></div>")
          original_errors = original.errors.dup
-@@ -624,6 +625,7 @@ eohtml
+@@ -629,6 +630,7 @@ eohtml
  
        def test_capturing_nonparse_errors_during_node_copy_between_docs
          skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?

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