[DRE-commits] [chef-zero] 06/07: Refresh patches.

Stefano Rivera stefano at rivera.za.net
Sat Aug 20 04:06:04 UTC 2016


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

stefanor pushed a commit to branch master
in repository chef-zero.

commit 5a18a3e4ff61ade202db1e585e8118b6980b38b5
Author: Stefano Rivera <stefanor at debian.org>
Date:   Fri Aug 19 20:54:03 2016 -0700

    Refresh patches.
---
 debian/changelog                                   |  1 +
 ...1-Remove-requires-of-rubygems-and-bundler.patch | 32 +++++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1be9d3c..cf54580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 chef-zero (4.9.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
   * Update copyright holder (Opscode renamed to Chef Software).
 
  -- Stefano Rivera <stefanor at debian.org>  Sat, 30 Jul 2016 16:20:49 -0400
diff --git a/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch b/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
index adbdd07..2ca3ecd 100644
--- a/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
+++ b/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
@@ -13,39 +13,39 @@ Subject: Remove requires of rubygems and bundler
 --- a/Rakefile
 +++ b/Rakefile
 @@ -1,6 +1,3 @@
--require 'bundler'
--require 'bundler/gem_tasks'
+-require "bundler"
+-require "bundler/gem_tasks"
 -
- require 'chef_zero/version'
+ require "chef_zero/version"
  
- def run_oc_pedant(env={})
+ def run_oc_pedant(env = {})
 --- a/bin/chef-zero
 +++ b/bin/chef-zero
 @@ -3,7 +3,6 @@
  # Trap interrupts to quit cleanly.
- Signal.trap('INT') { exit 1 }
+ Signal.trap("INT") { exit 1 }
  
--require 'rubygems'
+-require "rubygems"
  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
  
- require 'chef_zero/log'
+ require "chef_zero/log"
 --- a/lib/chef_zero/server.rb
 +++ b/lib/chef_zero/server.rb
 @@ -18,7 +18,6 @@
  
- require 'openssl'
- require 'open-uri'
--require 'rubygems'
- require 'timeout'
- require 'stringio'
+ require "openssl"
+ require "open-uri"
+-require "rubygems"
+ require "timeout"
+ require "stringio"
  
 --- a/spec/run_oc_pedant.rb
 +++ b/spec/run_oc_pedant.rb
 @@ -1,7 +1,4 @@
  #!/usr/bin/env ruby
--require 'bundler'
--require 'bundler/setup'
+-require "bundler"
+-require "bundler/setup"
 -
- require 'chef_zero/server'
- require 'rspec/core'
+ require "chef_zero/server"
+ require "rspec/core"
  

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



More information about the Pkg-ruby-extras-commits mailing list