[DRE-commits] [ruby-mkrf] 04/06: Unconditionally apply patches for Ruby 1.9+

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository ruby-mkrf.

commit 203d0c2bd68ce3313d9e0a4f4e71de8f33a1fd8c
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Dec 24 00:47:19 2013 +0100

    Unconditionally apply patches for Ruby 1.9+
---
 debian/patches/0610_fix_test_syck.patch | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0610_fix_test_syck.patch b/debian/patches/0610_fix_test_syck.patch
index d39680e..46a4f04 100644
--- a/debian/patches/0610_fix_test_syck.patch
+++ b/debian/patches/0610_fix_test_syck.patch
@@ -4,16 +4,12 @@ Last-Update: 2012-07-04
 
 --- a/test/sample_files/syck-0.55/ext/ruby/ext/syck/extconf.rb
 +++ b/test/sample_files/syck-0.55/ext/ruby/ext/syck/extconf.rb
-@@ -5,5 +5,9 @@
+@@ -5,5 +5,5 @@
  end
  
  Mkrf::Generator.new('syck') do |g|
 -  g.include_header("st.h")
-+  if RUBY_VERSION =~ /1\.9/
-+    g.include_header("ruby/backward/st.h")
-+  else
-+    g.include_header("st.h")
-+  end
++  g.include_header("ruby/backward/st.h")
  end
 --- a/test/sample_files/syck-0.55/lib/syck.h
 +++ b/test/sample_files/syck-0.55/lib/syck.h

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