[DRE-commits] [ruby-image-science] 05/07: Dropping inline_path_in_tmp patch, as it was applied upstream

[Gunnar Wolf]

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

gwolf pushed a commit to branch master
in repository ruby-image-science.

commit 58295fea38acecc1464f8cf35013f3ec41dfce23
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Tue Oct 1 11:58:32 2013 -0500

    Dropping inline_path_in_tmp patch, as it was applied upstream
---
 debian/changelog                  |    1 +
 debian/patches/inline_path_in_tmp |   36 ------------------------------------
 debian/patches/series             |    1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75ca5c9..7a46090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ruby-image-science (1.2.5-1) unstable; urgency=low
 
   * New upstream release
+  * Dropping inline_path_in_tmp patch, as it was applied upstream
 
  -- Gunnar Wolf <gwolf at debian.org>  Tue, 01 Oct 2013 11:47:47 -0500
 
diff --git a/debian/patches/inline_path_in_tmp b/debian/patches/inline_path_in_tmp
deleted file mode 100644
index 44b3baf..0000000
--- a/debian/patches/inline_path_in_tmp
+++ /dev/null
@@ -1,36 +0,0 @@
-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 64a19b3..3191781 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_ruby_path
-inline_path_in_tmp

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