[DRE-commits] [capistrano] 03/07: d/patches: Remove obsolete patches

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository capistrano.

commit 66c2c929897daf2a1fe6080e818eb5009c9533e7
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon Apr 21 15:19:56 2014 +0200

    d/patches: Remove obsolete patches
---
 ...emove-bundler-rubygems-stuff-from-test-code.patch | 20 --------------------
 debian/patches/0004-require-mocha-setup.patch        | 15 ---------------
 debian/patches/series                                |  2 --
 3 files changed, 37 deletions(-)

diff --git a/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch b/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch
deleted file mode 100644
index 5d80142..0000000
--- a/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 168ea6d3468651d36076f27938a042522575b496 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Fri, 6 Jan 2012 15:50:21 -0200
-Subject: [PATCH 2/2] Remove bundler/rubygems stuff from test code
-
----
- test/utils.rb |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-Index: capistrano/test/utils.rb
-===================================================================
---- capistrano.orig/test/utils.rb	2012-06-30 09:34:42.000000000 -0300
-+++ capistrano/test/utils.rb	2012-06-30 09:40:06.898070478 -0300
-@@ -1,6 +1,3 @@
--require 'rubygems'
--require 'bundler/setup'
--
- require 'test/unit'
- require 'mocha'
- 
diff --git a/debian/patches/0004-require-mocha-setup.patch b/debian/patches/0004-require-mocha-setup.patch
deleted file mode 100644
index 8a78fd6..0000000
--- a/debian/patches/0004-require-mocha-setup.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: require mocha/setup instead of mocha
- It is the correct way to initialize ruby-mocha >= 0.13
-Author: Cédric Boutillier <boutil at debian.org>
-Bug-Debian: http://bugs.debian.org/741828
-Last-Update: 2014-04-06
-
---- a/test/utils.rb
-+++ b/test/utils.rb
-@@ -1,5 +1,5 @@
- require 'test/unit'
--require 'mocha'
-+require 'mocha/setup'
- 
- require 'capistrano/server_definition'
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0966c8c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0002-Remove-bundler-rubygems-stuff-from-test-code.patch
-0004-require-mocha-setup.patch

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