← Back to branch summary

~ubuntu-branches/ubuntu/vivid/capistrano/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch

  • Committer: Package Import Robot
  • Author(s): Antonio Terceiro
  • Date: 2012-06-30 09:48:35 UTC
  • mfrom: (3.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20120630094835-vf8ylntcdylh65re
Tags: 2.12.0-1
http://bugs.debian.org/655389
* 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
* debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch:
  refreshed.
* Bump standards version to 3.9.3; no changes needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch
1
 
From 28dc639eda8187e4a876d7a8cd5ca6059236b3d2 Mon Sep 17 00:00:00 2001
2
 
From: Antonio Terceiro <terceiro@softwarelivre.org>
3
 
Date: Fri, 6 Jan 2012 15:44:02 -0200
4
 
Subject: [PATCH 1/2] Remove unecessary explicit rubygems access
5
 
 
6
 
Since the dependencies are already specified in the .gemspec, there is
7
 
no need for this.
8
 
---
9
 
 lib/capistrano/ssh.rb |    6 ------
10
 
 1 files changed, 0 insertions(+), 6 deletions(-)
11
 
 
12
 
diff --git a/lib/capistrano/ssh.rb b/lib/capistrano/ssh.rb
13
 
index 84bb969..2ed6f10 100644
14
 
--- a/lib/capistrano/ssh.rb
15
 
+++ b/lib/capistrano/ssh.rb
16
 
@@ -1,9 +1,3 @@
17
 
-begin
18
 
-  require 'rubygems'
19
 
-  gem 'net-ssh', ">= 2.0.10"
20
 
-rescue LoadError, NameError
21
 
-end
22
 
-
23
 
 require 'net/ssh'
24
 
 
25
 
 module Capistrano
26
 
1.7.8.2
27