[DRE-commits] [SCM] ruby-ffi.git branch, master, updated. debian/1.0.11debian-3-6-g234ee33

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 07b753713eedf8c164742dddaa545803b3161466
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 10:40:22 2012 -0300

    Disable rake-compiler

diff --git a/debian/changelog b/debian/changelog
index b518cb1..6c2be69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ruby-ffi (1.0.11debian-4) UNRELEASED; urgency=low
   * Bump standards version
   * Bump build dependency on gem2deb to >= 0.3.0~
   * debian/ruby-tests-rb: re-enable tests
+  * debian/patches/disable-rake-compiler.patch: disable rake-compiler
+    requirement in Rakefile, not needed.
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 30 Jun 2012 10:10:11 -0300
 
diff --git a/debian/patches/disable-rake-compiler.patch b/debian/patches/disable-rake-compiler.patch
new file mode 100644
index 0000000..6a9cff3
--- /dev/null
+++ b/debian/patches/disable-rake-compiler.patch
@@ -0,0 +1,23 @@
+Index: ruby-ffi/Rakefile
+===================================================================
+--- ruby-ffi.orig/Rakefile	2012-06-30 10:39:02.121931503 -0300
++++ ruby-ffi/Rakefile	2012-06-30 10:39:40.385929999 -0300
+@@ -1,12 +1,12 @@
+ require 'rubygems'
+ require 'rbconfig'
+ 
+-USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
+-if USE_RAKE_COMPILER
+-  gem 'rake-compiler', '>=0.6.0'
+-  require 'rake/extensiontask'
+-  ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2'
+-end
++USE_RAKE_COMPILER = false
++# if USE_RAKE_COMPILER
++#   gem 'rake-compiler', '>=0.6.0'
++#   require 'rake/extensiontask'
++#   ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2'
++# end
+ 
+ require 'date'
+ require 'fileutils'
diff --git a/debian/patches/series b/debian/patches/series
index e86c0b3..eda2407 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add-types.conf-files-for-missing-Debian-architecture.patch
 fix-test-on-sparc
 ftbfs-gcc-4.7.diff
+disable-rake-compiler.patch

-- 
ruby-ffi.git