[DRE-commits] [ruby-celluloid] 03/05: drop merged patch

[Praveen Arimbrathodiyil]

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

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

commit 24e9497a12389eb8cc948e79f200989b835b1ed8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 12 11:38:48 2015 +0530

    drop merged patch
---
 debian/changelog                             |  1 +
 debian/patches/fix_relative_path_rspec.patch | 17 -----------------
 debian/patches/series                        |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1028119..1c9c1ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-celluloid (0.16.0-1) UNRELEASED; urgency=medium
 
   * Team upload
   * New upstream release
+  * Drop fix_relative_path_rspec.patch (merged upstream)
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 12 May 2015 11:35:13 +0530
 
diff --git a/debian/patches/fix_relative_path_rspec.patch b/debian/patches/fix_relative_path_rspec.patch
deleted file mode 100644
index b396304..0000000
--- a/debian/patches/fix_relative_path_rspec.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: install files in spec/support in $vendorlib/celluloid/support
- fixing the corresponding paths in requires
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-11-04
-
---- a/lib/celluloid/rspec.rb
-+++ b/lib/celluloid/rspec.rb
-@@ -1,6 +1,6 @@
--require File.expand_path('../../../spec/support/example_actor_class', __FILE__)
--require File.expand_path('../../../spec/support/actor_examples', __FILE__)
--require File.expand_path('../../../spec/support/mailbox_examples', __FILE__)
-+require 'celluloid/support/example_actor_class'
-+require 'celluloid/support/actor_examples'
-+require 'celluloid/support/mailbox_examples'
- 
- module Celluloid
-   # Timer accuracy enforced by the tests (50ms)
diff --git a/debian/patches/series b/debian/patches/series
index 8368cf8..2a3943c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 remove-rubygems-bundler-coveralls.patch
-fix_relative_path_rspec.patch

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