[DRE-commits] [ruby-json-schema] 02/06: Remove obsolete patches

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-json-schema.

commit 8b4026e8c6aa1da1ec3a1c647fe6c8849556e17e
Author: Balasankar C <balasankarc at autistici.org>
Date:   Sun Nov 13 15:37:11 2016 +0530

    Remove obsolete patches
---
 debian/patches/no-loadpath-overload-in-tests.patch | 15 -----------
 debian/patches/update-addressable-24.patch         | 31 ----------------------
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/no-loadpath-overload-in-tests.patch b/debian/patches/no-loadpath-overload-in-tests.patch
deleted file mode 100644
index 0fd1296..0000000
--- a/debian/patches/no-loadpath-overload-in-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: don't overload LOAD_PATH in tests
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: no
-Last-Update: 2016-06-07
-
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,7 +1,6 @@
- require 'minitest/autorun'
- require 'webmock/minitest'
- 
--$:.unshift(File.expand_path('../../lib', __FILE__))
- require 'json-schema'
- 
- Dir[File.join(File.expand_path('../support', __FILE__), '*.rb')].each do |support_file|
diff --git a/debian/patches/update-addressable-24.patch b/debian/patches/update-addressable-24.patch
deleted file mode 100644
index cbef607..0000000
--- a/debian/patches/update-addressable-24.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Iain Beeston <iain at thoughtbot.com>
-Origin: https://github.com/iainbeeston/json-schema/commit/f5e07d5c07d50a9cdf6d4bbe615e4ff79b982142.patch
-Forwarded: https://github.com/ruby-json-schema/json-schema/pull/312/
-Date: Fri, 26 Feb 2016 09:02:18 +0000
-Subject: [PATCH] Allowed addressable 2.4+ to work with json-schema
-
-I've had to change one of the specs because of this. It seems that
-addressable now raises an error if you parse a uri that looks like a
-json text, which was one of our test cases.
-
-This fixes and supersedes #301
---- a/json-schema.gemspec
-+++ b/json-schema.gemspec
-@@ -23,5 +23,5 @@
-   s.add_development_dependency "webmock"
-   s.add_development_dependency "bundler"
- 
--  s.add_runtime_dependency "addressable", '~> 2.3.8'
-+  s.add_runtime_dependency "addressable", '>= 2.4'
- end
---- a/test/test_initialize_data.rb
-+++ b/test/test_initialize_data.rb
-@@ -40,7 +40,7 @@
- 
-     assert(JSON::Validator.validate(schema, data, :json => true))
- 
--    assert_raises(JSON::Schema::JsonLoadError) { JSON::Validator.validate(schema, data, :uri => true) }
-+    assert_raises(JSON::Schema::UriError) { JSON::Validator.validate(schema, data, :uri => true) }
-   end
- 
-   def test_parse_json_string

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