[DRE-commits] [ruby-mail-room] 03/05: remove relative path for require 'mail_room'

[Praveen Arimbrathodiyil]

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

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

commit be11642d4637044be2203abf6dfc1581967dd950
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 30 21:59:15 2016 +0530

    remove relative path for require 'mail_room'
---
 debian/changelog                              |  5 +++--
 debian/patches/remove-bundler-simplecov.patch | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc80c8f..9422294 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-ruby-mail-room (0.7.0-1) UNRELEASED; urgency=medium
+ruby-mail-room (0.7.0-1) unstable; urgency=medium
 
   * Team upload
   * New upstream release
+  * Remove relative path in require (fixes autopkgtest)
 
- -- Pirate Praveen <praveen at debian.org>  Sat, 28 May 2016 23:06:18 +0530
+ -- Pirate Praveen <praveen at debian.org>  Mon, 30 May 2016 21:57:50 +0530
 
 ruby-mail-room (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/patches/remove-bundler-simplecov.patch b/debian/patches/remove-bundler-simplecov.patch
index d814d29..92a63b0 100644
--- a/debian/patches/remove-bundler-simplecov.patch
+++ b/debian/patches/remove-bundler-simplecov.patch
@@ -2,7 +2,7 @@ Index: ruby-mail-room/spec/spec_helper.rb
 ===================================================================
 --- ruby-mail-room.orig/spec/spec_helper.rb
 +++ ruby-mail-room/spec/spec_helper.rb
-@@ -1,8 +1,3 @@
+@@ -1,14 +1,10 @@
 -require 'simplecov'
 -SimpleCov.start
 -
@@ -11,3 +11,11 @@ Index: ruby-mail-room/spec/spec_helper.rb
  require 'rspec'
  require 'mocha/api'
  require 'bourne'
+ require 'fakeredis/rspec'
+ 
+-require File.expand_path('../../lib/mail_room', __FILE__)
++$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
++require 'mail_room'
+ 
+ RSpec.configure do |config|
+   config.mock_with :mocha

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