[DRE-commits] [ruby-crack] 03/05: drop patches, not needed anymore

Cédric Boutillier boutil at alioth.debian.org
Thu Oct 3 13:44:20 UTC 2013


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

boutil pushed a commit to branch master
in repository ruby-crack.

commit b8add98bd6f83dd16e79778e669cc768672de9df
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Oct 3 15:31:30 2013 +0200

    drop patches, not needed anymore
---
 debian/patches/dont_call_gem                       |   18 ---------------
 debian/patches/no-rubygems-need-rexml.patch        |   20 -----------------
 debian/patches/series                              |    3 ---
 debian/patches/use_syck_in_tests_with_ruby19.patch |   23 --------------------
 4 files changed, 64 deletions(-)

diff --git a/debian/patches/dont_call_gem b/debian/patches/dont_call_gem
deleted file mode 100644
index 82e07e5..0000000
--- a/debian/patches/dont_call_gem
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: don't call gem, use package instead
-Author: Hideki Yamane <henrich at debian.org>
-
----
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2012-12-06
-
---- ruby-crack-0.3.1.orig/test/test_helper.rb
-+++ ruby-crack-0.3.1/test/test_helper.rb
-@@ -1,7 +1,6 @@
- require 'rubygems'
- require 'test/unit'
- require 'shoulda'
--gem 'jnunemaker-matchy', '>= 0.4.0'
- require 'matchy'
- 
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
diff --git a/debian/patches/no-rubygems-need-rexml.patch b/debian/patches/no-rubygems-need-rexml.patch
deleted file mode 100644
index 46f5490..0000000
--- a/debian/patches/no-rubygems-need-rexml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: We don't need rubygems, need rexml
- Without and explicit require for rexml/document,
- tests fail.
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Bug: https://github.com/jnunemaker/crack/pull/42
-Last-Updated: 2013-05-15
-
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,7 +1,9 @@
--require 'rubygems'
-+# We'll add dependencies in debian/control
-+# require 'rubygems'
- require 'test/unit'
- require 'shoulda'
- require 'matchy'
-+require "rexml/document"
- 
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
- $LOAD_PATH.unshift(File.dirname(__FILE__))
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5a126b8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-dont_call_gem
-no-rubygems-need-rexml.patch
-use_syck_in_tests_with_ruby19.patch
diff --git a/debian/patches/use_syck_in_tests_with_ruby19.patch b/debian/patches/use_syck_in_tests_with_ruby19.patch
deleted file mode 100644
index 06604d3..0000000
--- a/debian/patches/use_syck_in_tests_with_ruby19.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: use syck YAML engine for tests in Ruby1.9
- Because of the way Psych::SyntaxError are defined, some tests do not pass
- properly with Ruby1.9 and the Psych default YAML engine.
- Using Syck instead is a workaround this problem, which has been solved in
- the Ruby interpreter upstream
- https://github.com/tenderlove/psych/commit/66e22be9d7e33eb79b204a7d55ebc5abd5284e4d
-Author: Cédric Boutillier <boutil at debian.org>
-Bug: https://github.com/jnunemaker/crack/issues/26
-Last-Update: 2013-05-15
-
---- a/test/json_test.rb
-+++ b/test/json_test.rb
-@@ -1,6 +1,10 @@
- # coding: utf-8
- require 'test_helper'
- 
-+if RUBY_VERSION =~ /1\.9/
-+  YAML::ENGINE.yamler = "syck"
-+end
-+
- class JsonTest < Test::Unit::TestCase  
-   TESTS = {
-     %q({"data": "G\u00fcnter"})                   => {"data" => "Günter"},

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



More information about the Pkg-ruby-extras-commits mailing list