[DRE-commits] [SCM] capistrano.git branch, master, updated. debian/2.9.0-1-12-gc682643

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 33c8d25db6d3ef072a24dc393e8a60581f6295a0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 09:42:30 2012 -0300

    Refresh debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch

diff --git a/debian/changelog b/debian/changelog
index 4b38ea4..8821da7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ capistrano (2.12.0-1) UNRELEASED; urgency=low
   * Bump build dependency on gem2deb to 0.3.0~
   * debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch:
     removed, applied upstream
+  * debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch:
+    refreshed.
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 29 Jun 2012 17:45:44 -0300
 
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
index c870dd8..5d80142 100644
--- a/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch
+++ b/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch
@@ -7,18 +7,14 @@ Subject: [PATCH 2/2] Remove bundler/rubygems stuff from test code
  test/utils.rb |    4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)
 
-diff --git a/test/utils.rb b/test/utils.rb
-index 6b1ae79..a430590 100644
---- a/test/utils.rb
-+++ b/test/utils.rb
-@@ -1,7 +1,3 @@
+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 'ruby-debug'
  require 'test/unit'
  require 'mocha'
  
--- 
-1.7.8.2
-

-- 
capistrano.git