[DRE-commits] [yard] 13/13: New patch to pass autopkgtest

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository yard.

commit 35f26229fe5419c086b33383056bbe63259679b3
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 12 21:55:56 2017 -0200

    New patch to pass autopkgtest
---
 ...004-spec-add-missing-require-spec_helper.patch} |  0
 .../0005-spec_helper-avoid-relative-require.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0005-spec-add-missing-require-spec_helper.patch b/debian/patches/0004-spec-add-missing-require-spec_helper.patch
similarity index 100%
rename from debian/patches/0005-spec-add-missing-require-spec_helper.patch
rename to debian/patches/0004-spec-add-missing-require-spec_helper.patch
diff --git a/debian/patches/0005-spec_helper-avoid-relative-require.patch b/debian/patches/0005-spec_helper-avoid-relative-require.patch
new file mode 100644
index 0000000..4bfcb20
--- /dev/null
+++ b/debian/patches/0005-spec_helper-avoid-relative-require.patch
@@ -0,0 +1,22 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Thu, 12 Jan 2017 21:54:47 -0200
+Subject: spec_helper: avoid relative require
+
+Just trust that $LOAD_PATH is correctly set.
+---
+ spec/spec_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 61f1fc1..ead36f1 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -12,7 +12,7 @@ rescue LoadError
+   nil # noop
+ end
+ 
+-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'yard'))
++require 'yard'
+ 
+ unless defined?(HAVE_RIPPER)
+   begin require 'ripper'; rescue LoadError; nil end
diff --git a/debian/patches/series b/debian/patches/series
index 2f7c55b..b30d930 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0001-remove-timestamps-where-possible-for-reproducible-bu.patch
 0002-Prevent-possible-privacy-breach-with-distant-images.patch
 0003-spec-avoid-writing-to-file-shipped-with-upstream-sou.patch
-0005-spec-add-missing-require-spec_helper.patch
+0004-spec-add-missing-require-spec_helper.patch
+0005-spec_helper-avoid-relative-require.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/yard.git