[DRE-commits] [SCM] ruby-ferret.git branch, master, updated. debian/0.11.6-3-25-gf7cc012

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit ee3a4e2e44fa9a3f160974bf39556ba56190c9ad
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Jun 15 10:55:48 2012 +0200

    disable other loadpath manips

diff --git a/debian/patches/disable_load_path_manipulation.patch b/debian/patches/disable_load_path_manipulation.patch
index cc32f0b..da3d6ec 100644
--- a/debian/patches/disable_load_path_manipulation.patch
+++ b/debian/patches/disable_load_path_manipulation.patch
@@ -37,3 +37,21 @@ Last-Update: 2012-06-14
  
  ENV['LANG'] = "en_US.UTF-8"
  ENV['LC_CTYPE'] = "en_US.UTF-8"
+--- a/bin/ferret-browser
++++ b/bin/ferret-browser
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+ 
+-$: << File.expand_path(File.join(File.basename(__FILE__), '../lib'))
++#$: << File.expand_path(File.join(File.basename(__FILE__), '../lib'))
+ require 'ferret'
+ require 'ferret/browser'
+ 
+--- a/test/threading/thread_safety_index_test.rb
++++ b/test/threading/thread_safety_index_test.rb
+@@ -1,4 +1,4 @@
+-$:.unshift('.')
++#$:.unshift('.')
+ require 'monitor'
+ require File.dirname(__FILE__) + "/../test_helper"
+ require File.dirname(__FILE__) + "/number_to_spoken.rb"

-- 
ruby-ferret.git