[DRE-commits] [rails-3.2] 06/11: remove broken patch

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails-3.2.

commit 98b0fbdc13399671a0c10cc9abfd594c84317e7a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Dec 14 15:12:23 2013 -0300

    remove broken patch
---
 debian/patches/port-to-minitest.patch | 24 ------------------------
 debian/patches/series                 |  1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/port-to-minitest.patch b/debian/patches/port-to-minitest.patch
deleted file mode 100644
index c879e43..0000000
--- a/debian/patches/port-to-minitest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: use minitest instead of test/unit
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709431#20
-Last-update: 2013-06-05
-
---- rails-3.2.orig/actionpack/lib/action_dispatch/testing/integration.rb
-+++ rails-3.2/actionpack/lib/action_dispatch/testing/integration.rb
-@@ -4,7 +4,7 @@ require 'active_support/core_ext/kernel/
- require 'active_support/core_ext/object/inclusion'
- require 'active_support/core_ext/object/try'
- require 'rack/test'
--require 'test/unit/assertions'
-+require 'minitest'
- 
- module ActionDispatch
-   module Integration #:nodoc:
---- rails-3.2.orig/activesupport/lib/active_support/test_case.rb
-+++ rails-3.2/activesupport/lib/active_support/test_case.rb
-@@ -1,4 +1,4 @@
--require 'test/unit/testcase'
-+require 'minitest'
- require 'active_support/testing/setup_and_teardown'
- require 'active_support/testing/assertions'
- require 'active_support/testing/deprecation'
diff --git a/debian/patches/series b/debian/patches/series
index d9a2ce7..dd9b3b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-port-to-minitest.patch
 Remove_rubygems_dependency.patch
 be-carefull-with-that-bundler.patch
 fix-rake-tmp-tasks.patch

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