[DRE-commits] [SCM] yard.git branch, master, updated. upstream/0.7.4-44-g2e948b4

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit c1c7b3e27104aa9d705a4b52838c5a0125fe0b83
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun May 6 14:47:58 2012 +0200

    patch: remove_rubygems_and_path_manipulation_from_spec.patch
    
    - do not require rubygems
    - don't modify path from which yard library is loaded

diff --git a/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch b/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
new file mode 100644
index 0000000..3d4dee5
--- /dev/null
+++ b/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
@@ -0,0 +1,22 @@
+Description: Remove call to rubygems and path manipulation to load yard
+ This is not necessary because gem2deb took care of everything already.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-05-06
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,11 +1,7 @@
+-require "rubygems"
+-begin
+-  require "rspec"
+-rescue LoadError
+-  require "spec"
+-end
++require "rspec"
+ 
+-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'yard'))
++#require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'yard'))
++require "yard"
+ 
+ unless defined?(HAVE_RIPPER)
+   begin require 'ripper'; rescue LoadError; end
diff --git a/debian/patches/series b/debian/patches/series
index d48c483..bd3d0ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 require-in-executables.patch
 set-templates-path.patch
+remove_rubygems_and_path_manipulation_from_spec.patch

-- 
yard.git