[DRE-commits] [SCM] yard.git branch, master, updated. debian/0.8.1-1-24-g6a006a9

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 9a7d5791a52c44b531b92fc51cbc0b228d7b1cd4
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue May 7 15:09:06 2013 +0200

    refresh remove_rubygems_and_path_manipulation_from_spec.patch and require-in-executables.patch

diff --git a/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch b/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
index 3d4dee5..01b262f 100644
--- a/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
+++ b/debian/patches/remove_rubygems_and_path_manipulation_from_spec.patch
@@ -1,21 +1,33 @@
 Description: Remove call to rubygems and path manipulation to load yard
+ Remove also the use of bundler
  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
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-05-07
 
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,11 +1,7 @@
+@@ -1,15 +1,4 @@
 -require "rubygems"
 -begin
 -  require "rspec"
 -rescue LoadError
 -  require "spec"
 -end
+-
+-begin
+-  require 'bundler'
+-  Bundler.setup
+-rescue LoadError
+-end
 +require "rspec"
  
+ begin
+   require 'simplecov'
+@@ -24,7 +13,7 @@
+ rescue LoadError
+ end if ENV['COVERAGE']
+ 
 -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)
diff --git a/debian/patches/require-in-executables.patch b/debian/patches/require-in-executables.patch
index 99726da..5ca4074 100644
--- a/debian/patches/require-in-executables.patch
+++ b/debian/patches/require-in-executables.patch
@@ -1,7 +1,7 @@
 Description: Do not modify $LOAD_PATH in YARD binaries
  We know exactly where to find the library
-Author: Cédric Boutiller <cedric.boutillier at gmail.com>
-Last-Update: 2012-05-04
+Author: Cédric Boutiller <boutil at debian.org>
+Last-Update: 2012-05-07
 
 --- a/bin/yardoc
 +++ b/bin/yardoc
@@ -11,13 +11,13 @@ Last-Update: 2012-05-04
 -# We do all this work just to find the proper load path
 -path = __FILE__
 -while File.symlink?(path)
--  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
+-  path = File.expand_path(File.readlink(path), File.dirname(path))
 -end
 -$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
 +## We do all this work just to find the proper load path
 +#path = __FILE__
 +#while File.symlink?(path)
-+#  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
++#  path = File.expand_path(File.readlink(path), File.dirname(path))
 +#end
 +#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
  
@@ -31,13 +31,13 @@ Last-Update: 2012-05-04
 -# We do all this work just to find the proper load path
 -path = __FILE__
 -while File.symlink?(path)
--  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
+-  path = File.expand_path(File.readlink(path), File.dirname(path))
 -end
 -$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
 +## We do all this work just to find the proper load path
 +#path = __FILE__
 +#while File.symlink?(path)
-+#  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
++#  path = File.expand_path(File.readlink(path), File.dirname(path))
 +#end
 +#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
  
@@ -51,13 +51,13 @@ Last-Update: 2012-05-04
 -# We do all this work just to find the proper load path
 -path = __FILE__
 -while File.symlink?(path)
--  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
+-  path = File.expand_path(File.readlink(path), File.dirname(path))
 -end
 -$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
 +## We do all this work just to find the proper load path
 +#path = __FILE__
 +#while File.symlink?(path)
-+#  path = File.expand_path(File.readlink(__FILE__), File.dirname(__FILE__))
++#  path = File.expand_path(File.readlink(path), File.dirname(path))
 +#end
 +#$:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
  

-- 
yard.git