[DRE-commits] [ruby-sawyer] 01/02: don't use relative require

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-sawyer.

commit 55aec157cd5e3519127d850175f4e5b38a6c03be
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 31 22:39:19 2016 +0530

    don't use relative require
---
 debian/changelog                            |  7 ++++++-
 debian/patches/03_no_relative_require.patch | 15 +++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 241056e..76f9f92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 ruby-sawyer (0.7.0-1) unstable; urgency=medium
 
   * Team upload
+
+  [ Sudheesh Shetty ]
   * New upstream release 
   * Changed patches to work in couple of tests
   * Check gemspec dependencies during build
 
- -- Sudheesh Shetty <sudheeshshetty at gmail.com>  Sat, 19 Mar 2016 10:55:19 +0530
+  [ Pirate Praveen]
+  * Don't use relative path for require (fixes autopkgtest)
+
+ -- Pirate Praveen <praveen at debian.org>  Tue, 31 May 2016 22:38:18 +0530
 
 ruby-sawyer (0.6.0-2) unstable; urgency=medium
 
diff --git a/debian/patches/03_no_relative_require.patch b/debian/patches/03_no_relative_require.patch
new file mode 100644
index 0000000..af4bffc
--- /dev/null
+++ b/debian/patches/03_no_relative_require.patch
@@ -0,0 +1,15 @@
+don't use relative path for require
+ - fixes autopkgtest failure
+
+Index: ruby-sawyer/test/helper.rb
+===================================================================
+--- ruby-sawyer.orig/test/helper.rb
++++ ruby-sawyer/test/helper.rb
+@@ -1,5 +1,6 @@
+ require "minitest/autorun"
+-require File.expand_path('../../lib/sawyer', __FILE__)
++$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
++require 'sawyer'
+ 
+ class Sawyer::TestCase < Minitest::Test
+   def default_test
diff --git a/debian/patches/series b/debian/patches/series
index a92d3d9..9d55128 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_tests_encoding_issue.diff
 02_disable_tests_depending_on_network_access.diff
+03_no_relative_require.patch

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