[DRE-commits] [SCM] ruby-markaby.git branch, master, updated. upstream/0.7.2-11-g57dbfd8

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit d3bc135c33584c91bf4ce33075412e7496a8cfc0
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Aug 31 15:36:25 2011 +0200

    patch preventing override of $LOAD_PATH

diff --git a/debian/patches/02_prevent_$LOAD_PATH_override.diff b/debian/patches/02_prevent_$LOAD_PATH_override.diff
new file mode 100644
index 0000000..aaf3f1d
--- /dev/null
+++ b/debian/patches/02_prevent_$LOAD_PATH_override.diff
@@ -0,0 +1,26 @@
+Description: prevent override of system LOAD_PATH
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-08-26
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -2,7 +2,7 @@
+ require 'test/unit/autorunner'
+ require 'rspec'
+ 
+-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
++#$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+ 
+ require 'markaby'
+ require 'markaby/kernel_method'
+--- a/lib/markaby.rb
++++ b/lib/markaby.rb
+@@ -4,7 +4,7 @@
+ # as well as the full set of Markaby classes.
+ #
+ # For a full list of features and instructions, see the README.
+-$:.unshift File.expand_path(File.dirname(__FILE__))
++#$:.unshift File.expand_path(File.dirname(__FILE__))
+ 
+ # Markaby is a module containing all of the great Markaby classes that
+ # do such an excellent job.
diff --git a/debian/patches/series b/debian/patches/series
index 7c8d52a..3292c05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_fix_VERSION.diff
+02_prevent_$LOAD_PATH_override.diff

-- 
ruby-markaby.git