[DRE-commits] [SCM] ruby-parsetree.git branch, master, updated. debian/3.0.8-3

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 51982253f3be3d726fd22efbc9e81917d62c7207
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Wed Mar 21 18:56:06 2012 -0600

    Fix FTBFS under sbuild because it does not provide a home directory (Closes: #652802)

diff --git a/debian/changelog b/debian/changelog
index 7d98a27..c57d84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-parsetree (3.0.8-3) unstable; urgency=low
+
+  * Fix FTBFS under sbuild because it does not provide a home directory
+    (Closes: #652802)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 21 Mar 2012 18:55:52 -0600
+
 ruby-parsetree (3.0.8-2) unstable; urgency=low
 
   * debian/control
diff --git a/debian/patches/ruby_inline_without_home_directory b/debian/patches/ruby_inline_without_home_directory
new file mode 100644
index 0000000..7f3a410
--- /dev/null
+++ b/debian/patches/ruby_inline_without_home_directory
@@ -0,0 +1,38 @@
+From: Felix Geyer <debfx-pkg at fobos.de>
+Bug-Debian: http://bugs.debian.org/664973
+Forwarded: https://github.com/seattlerb/parsetree/pull/2
+Last-Update: 2012-03-21
+Description: Fix to the tests to build with no set home directory
+ Ruby's Inline module builds in ~/.ruby_inline by default, but it's
+ not defined when building with sbuild.
+
+Index: ruby-parsetree/test/test_parse_tree.rb
+===================================================================
+--- ruby-parsetree.orig/test/test_parse_tree.rb	2011-11-24 17:06:52.000000000 -0600
++++ ruby-parsetree/test/test_parse_tree.rb	2012-03-21 18:09:02.000000000 -0600
+@@ -1,12 +1,18 @@
+ #!/usr/local/bin/ruby -w
+ 
+-dir = File.expand_path "~/.ruby_inline"
+-if test ?d, dir then
+-  require 'fileutils'
+-  puts "nuking #{dir}"
+-  # force removal, Windoze is bitching at me, something to hunt later...
+-  FileUtils.rm_r dir, :force => true
+-end
++# instead of using Inline's regular directory in the user's home, use
++# a temporary directory
++
++#dir = File.expand_path "~/.ruby_inline"
++#if test ?d, dir then
++#  require 'fileutils'
++#  puts "nuking #{dir}"
++#  # force removal, Windoze is bitching at me, something to hunt later...
++#  FileUtils.rm_r dir, :force => true
++#end
++
++require 'tmpdir'
++ENV['INLINEDIR'] = Dir.mktmpdir
+ 
+ require 'minitest/autorun'
+ require 'parse_tree'
diff --git a/debian/patches/series b/debian/patches/series
index 5b9a858..68929c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_ruby_path
 drop_require_rubygems
+ruby_inline_without_home_directory

-- 
ruby-parsetree.git