[DRE-commits] [SCM] capistrano.git branch, master, updated. 209f29ed97e9546b6e62213e742939fe6f6d4b73

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 5f04651d984846cabcce3e00b9915d08130bab5f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jan 6 16:36:35 2012 -0200

    Now really export patches

diff --git a/debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch b/debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch
new file mode 100644
index 0000000..6bbaf45
--- /dev/null
+++ b/debian/patches/0001-Remove-unecessary-explicit-rubygems-access.patch
@@ -0,0 +1,28 @@
+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/0002-Remove-bundler-rubygems-stuff-from-test-code.patch b/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch
new file mode 100644
index 0000000..c870dd8
--- /dev/null
+++ b/debian/patches/0002-Remove-bundler-rubygems-stuff-from-test-code.patch
@@ -0,0 +1,24 @@
+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(-)
+
+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 @@
+-require 'rubygems'
+-require 'bundler/setup'
+-
+-require 'ruby-debug'
+ require 'test/unit'
+ require 'mocha'
+ 
+-- 
+1.7.8.2
+

-- 
capistrano.git