[DRE-commits] [ruby-commander] 02/03: Refresh patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-commander.

commit 57f217b7362f0326cfa64ed79d1c9ef4570a04cd
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Aug 12 19:14:59 2014 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-Drop-RubyGems-Depends.patch | 41 ++-----------------------
 debian/patches/0002-Drop-SimpleCov.patch        | 15 ++++-----
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/debian/patches/0001-Drop-RubyGems-Depends.patch b/debian/patches/0001-Drop-RubyGems-Depends.patch
index 9cb03de..d32d4ee 100644
--- a/debian/patches/0001-Drop-RubyGems-Depends.patch
+++ b/debian/patches/0001-Drop-RubyGems-Depends.patch
@@ -8,45 +8,10 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  spec/spec_helper.rb | 3 +--
  2 files changed, 2 insertions(+), 5 deletions(-)
 
-diff --git a/bin/commander b/bin/commander
-index 393daec..201f9d1 100755
---- a/bin/commander
-+++ b/bin/commander
-@@ -1,6 +1,5 @@
- #!/usr/bin/env ruby
- 
--require 'rubygems'
- require 'commander/import'
- 
- program :name, 'commander'
-@@ -23,7 +22,6 @@ command :init do |c|
-         f.write <<-"...".gsub!(/^ {10}/, '')
-           #!/usr/bin/env ruby
-           
--          require 'rubygems'
-           require 'commander/import'
-           
-           program :version, '0.0.1'
-@@ -52,4 +50,4 @@ command :init do |c|
-        abort e
-      end
-   end
--end
-\ No newline at end of file
-+end
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index c302ab6..4fe1fae 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+--- ruby-commander.orig/spec/spec_helper.rb
++++ ruby-commander/spec/spec_helper.rb
 @@ -1,4 +1,3 @@
 -require 'rubygems'
  require 'stringio'
  require 'simplecov'
- SimpleCov.start
-@@ -72,4 +71,4 @@ def run *args
-     program :help_formatter, Commander::HelpFormatter::Base
-   end.run!    
-   @output.string
--end
-\ No newline at end of file
-+end
+ SimpleCov.start do
diff --git a/debian/patches/0002-Drop-SimpleCov.patch b/debian/patches/0002-Drop-SimpleCov.patch
index 30b992e..373e66a 100644
--- a/debian/patches/0002-Drop-SimpleCov.patch
+++ b/debian/patches/0002-Drop-SimpleCov.patch
@@ -7,14 +7,15 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  spec/spec_helper.rb | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 4fe1fae..93374ca 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,6 +1,4 @@
+--- ruby-commander.orig/spec/spec_helper.rb
++++ ruby-commander/spec/spec_helper.rb
+@@ -1,9 +1,4 @@
  require 'stringio'
 -require 'simplecov'
--SimpleCov.start
- 
+-SimpleCov.start do
+-  add_filter "/spec/"
+-end
+-
  # Unshift so that local files load instead of something in gems
  $:.unshift File.dirname(__FILE__) + '/../lib'
+ 

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