[DRE-commits] [SCM] ruby-taglib2.git branch, master, updated. upstream/0.1.5-23-g24e5d16

[Vincent Carmona]

The following commit has been merged in the master branch:
commit 3cfe266da10cee2baed6c3998981914ae4c5f86d
Author: Vincent Carmona <vinc4mai at gmail.com>
Date:   Fri Feb 24 00:48:11 2012 +0100

    Do not override ruby load path during tests

diff --git a/debian/changelog b/debian/changelog
index 7c3d817..549bc39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ruby-taglib2 (0.1.5-1) unstable; urgency=low
     - build depends on ruby-minitest
     - depends on ruby instead of ruby1.8
   * d/patches
+    - do_not_override_loadpath_for_tests
     - ruby-minitest_after_tests
       MiniTest::Unit.after_tests method is called before the end of all tests
 
diff --git a/debian/patches/do_not_override_loadpath_for_tests b/debian/patches/do_not_override_loadpath_for_tests
new file mode 100644
index 0000000..39ad10a
--- /dev/null
+++ b/debian/patches/do_not_override_loadpath_for_tests
@@ -0,0 +1,16 @@
+--- a/tests/tests.rb
++++ b/tests/tests.rb
+@@ -29,10 +29,10 @@
+ end
+ 
+ dir=File.expand_path(File.join(File.dirname(__FILE__), ".."))
+-$:.unshift(dir)
+-$:.unshift(File.join(dir, 'lib'))
++#$:.unshift(dir)
++#$:.unshift(File.join(dir, 'lib'))
+ if compat
+-	$:.unshift(File.join(dir, 'compat'))
++#	$:.unshift(File.join(dir, 'compat'))
+ 	require 'taglib'
+ else
+ 	require "taglib2"
diff --git a/debian/patches/series b/debian/patches/series
index 61f88a8..f156cb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+do_not_override_loadpath_for_tests
 ruby-minitest_after_tests
 fix-require.diff
 compat.diff

-- 
ruby-taglib2.git