[DRE-commits] [SCM] ruby-taglib2.git branch, master, updated. upstream/0.1.4-22-g13dedca

[Vincent Carmona]

The following commit has been merged in the master branch:
commit ea5e31993f40a60a6d084adf2f13d92591f056c1
Author: Vincent Carmona <vinc4mai at gmail.com>
Date:   Thu Feb 23 19:16:55 2012 +0100

    Remove use_fileutils_instead_of_ftools patch

diff --git a/debian/patches/series b/debian/patches/series
index 6034787..f61f59b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-require.diff
 compat.diff
-use_fileutils_instead_of_ftools
diff --git a/debian/patches/use_fileutils_instead_of_ftools b/debian/patches/use_fileutils_instead_of_ftools
deleted file mode 100644
index a712738..0000000
--- a/debian/patches/use_fileutils_instead_of_ftools
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Use fileutils insted of ftools in tests/tests.rb
- Upstream test script use "ftools". This library is too old.
- This patch replace to use "fileutils" instead of "ftools".
- .
---- ruby-taglib2-0.1.4.orig/tests/tests.rb
-+++ ruby-taglib2-0.1.4/tests/tests.rb
-@@ -20,7 +20,7 @@ This file is part of ruby-taglib2.
- =end
- 
- require "test/unit"
--require 'ftools'
-+require 'fileutils'
- 
- class Test::Unit::TestSuite
- 	alias :old_testunit_run_for_taglib2 :run
-@@ -60,7 +60,7 @@ class TaglibTestsUtil
- 	end
- 
- 	def TaglibTestsUtil.clean
--		if File.exists?(@@tmp)
-+		if File.exist?(@@tmp)
- 			File.delete(*Dir.glob(File.join(@@tmp, '*')))
- 			Dir.rmdir(@@tmp)
- 		end
-@@ -69,11 +69,11 @@ class TaglibTestsUtil
- 	def TaglibTestsUtil.setup
- 		data=File.join(@@tmp, '..', 'data')
- 		TaglibTestsUtil.clean
--		File.makedirs(@@tmp)
--		File.copy(File.join(data, 'silence.wav'), @@read)
--		File.copy(File.join(data, 'empty'), @@empty)
--		File.copy(File.join(data, 'silence.wav'), @@write)
--		File.copy(File.join(data, 'exceptions.ogg'), @@exceptions)
-+		FileUtils.makedirs(@@tmp)
-+		FileUtils.copy(File.join(data, 'silence.wav'), @@read)
-+		FileUtils.copy(File.join(data, 'empty'), @@empty)
-+		FileUtils.copy(File.join(data, 'silence.wav'), @@write)
-+		FileUtils.copy(File.join(data, 'exceptions.ogg'), @@exceptions)
- 	end
- 
- 	def TaglibTestsUtil.teardown

-- 
ruby-taglib2.git