[DRE-commits] [SCM] ruby-mkrf.git branch, master, updated. debian/0.2.3+dfsg-1-16-g7135191

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 28f882a22d0a827d3737feccf31befb8f69c63d1
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 24 22:16:18 2013 +0200

    comment out obsolete commands in Rakefile, wich caused FTBFS (Closes #713149).

diff --git a/debian/patches/0150_update_rakefile.patch b/debian/patches/0150_update_rakefile.patch
new file mode 100644
index 0000000..e6fb7b5
--- /dev/null
+++ b/debian/patches/0150_update_rakefile.patch
@@ -0,0 +1,50 @@
+Description: comment all obsolete commands in Rakefile
+ Fixes FTBFS with newer rake
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713149
+Last-Update: 2013-06-23
+
+
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,8 +1,8 @@
+ require 'rake'
+ require 'rake/testtask'
+ require 'rake/packagetask'
+-require 'rake/gempackagetask'
+-require 'rake/rdoctask'
++#require 'rake/gempackagetask'
++#require 'rake/rdoctask'
+ #require 'rubygems'
+ 
+ 
+@@ -91,10 +91,10 @@
+ 
+ end
+ 
+-Rake::RDocTask.new do |rd|
+-  rd.main = "README"
+-  rd.rdoc_files.include("README", "lib/**/*.rb")
+-end
++#Rake::RDocTask.new do |rd|
++#  rd.main = "README"
++#  rd.rdoc_files.include("README", "lib/**/*.rb")
++#end
+   
+ # Create compressed packages
+ spec = Gem::Specification.new do |s|
+@@ -122,8 +122,8 @@
+   s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
+ end
+   
+-Rake::GemPackageTask.new(spec) do |p|
+-  p.gem_spec = spec
+-  p.need_tar = true
+-  p.need_zip = true
+-end
++#Rake::GemPackageTask.new(spec) do |p|
++#  p.gem_spec = spec
++#  p.need_tar = true
++#  p.need_zip = true
++#end
diff --git a/debian/patches/series b/debian/patches/series
index 0769705..740a829 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0100_remove_rubygems.patch
+0150_update_rakefile.patch
 0200_remove_load_path_manipulations.rb
 0300_fix_test_default_include_dir_should_be_from_rbconfig.patch
 0400_use_correct_ruby_version_in_tests.patch

-- 
ruby-mkrf.git