[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 706717bce526aef8849276d452f09b56bb12ed24
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 09:39:20 2012 -0300

    Remove patch applied upstream

diff --git a/debian/changelog b/debian/changelog
index 4163844..4b38ea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ capistrano (2.12.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Fix typo in the short description (Closes: #655389)
   * Bump build dependency on gem2deb to 0.3.0~
+  * debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch:
+    removed, applied upstream
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 29 Jun 2012 17:45:44 -0300
 
diff --git a/debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch b/debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch
deleted file mode 100644
index 6bbaf45..0000000
--- a/debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 28dc639eda8187e4a876d7a8cd5ca6059236b3d2 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Fri, 6 Jan 2012 15:44:02 -0200
-Subject: [PATCH 1/2] Remove unecessary explicit rubygems access
-
-Since the dependencies are already specified in the .gemspec, there is
-no need for this.
----
- lib/capistrano/ssh.rb |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/lib/capistrano/ssh.rb b/lib/capistrano/ssh.rb
-index 84bb969..2ed6f10 100644
---- a/lib/capistrano/ssh.rb
-+++ b/lib/capistrano/ssh.rb
-@@ -1,9 +1,3 @@
--begin
--  require 'rubygems'
--  gem 'net-ssh', ">= 2.0.10"
--rescue LoadError, NameError
--end
--
- require 'net/ssh'
- 
- module Capistrano
--- 
-1.7.8.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 6a46335..a44e1a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Remove-unecessary-explicit-rubygems-access.patch
 0002-Remove-bundler-rubygems-stuff-from-test-code.patch

-- 
capistrano.git