[DRE-commits] [SCM] ruby-image-science.git branch, master, updated. debian/1.2.1-4

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit d80aa46a3323a29312621fa8447dbd2652902a7e
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Thu Mar 15 13:13:45 2012 -0600

    Use a temporary directory for the Inline files used during the test (Closes: #652802)

diff --git a/debian/changelog b/debian/changelog
index 2357123..ffbf97a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-image-science (1.2.1-4) unstable; urgency=low
+
+  * Use a temporary directory for the Inline files used during the test
+    (Closes: #652802)
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 15 Mar 2012 12:59:14 -0600
+
 ruby-image-science (1.2.1-3) unstable; urgency=low
 
   * Ouch! Uploaded -2 some minutes ago... And forgot some dependencies
diff --git a/debian/patches/fix_ruby_path b/debian/patches/fix_ruby_path
index 9ceb7ad..eeb679a 100644
--- a/debian/patches/fix_ruby_path
+++ b/debian/patches/fix_ruby_path
@@ -1,3 +1,8 @@
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: Not-needed (trivial)
+Last-update: 2011-09-14
+Description: Fix the hashbang to use the systemwide Ruby
+
 Index: ruby-image-science-1.2.1/lib/image_science.rb
 ===================================================================
 --- ruby-image-science-1.2.1.orig/lib/image_science.rb	2011-09-14 16:49:15.000000000 -0500
diff --git a/debian/patches/inline_path_in_tmp b/debian/patches/inline_path_in_tmp
new file mode 100644
index 0000000..44b3baf
--- /dev/null
+++ b/debian/patches/inline_path_in_tmp
@@ -0,0 +1,36 @@
+Author: Gunnar Wolf <gwolf at debian.org
+Last-update: 2012-03-15
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652802
+Forwarded: http://rubyforge.org/tracker/index.php?func=detail&aid=29544&group_id=1513&atid=5921
+Description: Use a temporary directory instead of ~ for the tests
+ The tests wipe ~/.ruby_inline (and later use it). This causes sbuild
+ to fail, as the home directory does not exist.
+
+Index: ruby-image-science/test/test_image_science.rb
+===================================================================
+--- ruby-image-science.orig/test/test_image_science.rb	2011-09-14 16:53:31.000000000 -0500
++++ ruby-image-science/test/test_image_science.rb	2012-03-15 13:13:31.000000000 -0600
+@@ -1,10 +1,16 @@
+-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 'rubygems'
+ require 'minitest/unit'
diff --git a/debian/patches/series b/debian/patches/series
index 3191781..64a19b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_ruby_path
+inline_path_in_tmp

-- 
ruby-image-science.git