[DRE-commits] [ruby-json] 05/10: Update patches
Lucas Nussbaum
lucas at moszumanska.debian.org
Thu Jul 21 21:28:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ruby-json.
commit 5fab0295b80374b6b3b8cc49d4339e6092171f92
Author: Lucas Nussbaum <lucas at debian.org>
Date: Thu Jul 21 22:27:59 2016 +0200
Update patches
---
debian/patches/02-fix-fuzz.rb-shebang.patch | 2 +-
debian/patches/04-fix-tests-path.patch | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/debian/patches/02-fix-fuzz.rb-shebang.patch b/debian/patches/02-fix-fuzz.rb-shebang.patch
index f7499b7..a43556f 100644
--- a/debian/patches/02-fix-fuzz.rb-shebang.patch
+++ b/debian/patches/02-fix-fuzz.rb-shebang.patch
@@ -8,4 +8,4 @@ Last-Update: 2011-04-03
+
require 'json'
- require 'iconv'
+ class Fuzzer
diff --git a/debian/patches/04-fix-tests-path.patch b/debian/patches/04-fix-tests-path.patch
index 8f23e40..3df29a7 100644
--- a/debian/patches/04-fix-tests-path.patch
+++ b/debian/patches/04-fix-tests-path.patch
@@ -3,9 +3,10 @@ Description: Let debian/ruby-tests.rb handle the test suite loading
Origin: vendor
Author: Lucas Nussbaum <lucas at debian.org>
Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634438
---- a/tests/setup_variant.rb
-+++ b/tests/setup_variant.rb
-@@ -1,11 +1,8 @@
+--- a/tests/test_helper.rb
++++ b/tests/test_helper.rb
+@@ -2,13 +2,10 @@ gem 'json', File.read('VERSION').chomp
+
case ENV['JSON']
when 'pure'
- $:.unshift 'lib'
@@ -17,3 +18,4 @@ Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634438
- $:.unshift 'ext', 'lib'
require 'json'
end
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-json.git
More information about the Pkg-ruby-extras-commits
mailing list