[DRE-commits] [chef-zero] 05/09: Refresh patches

[Stefano Rivera]

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

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

commit c92b956b1f6122462405a231c7dd190c6930334c
Author: Stefano Rivera <stefanor at debian.org>
Date:   Thu Dec 31 22:03:12 2015 +0200

    Refresh patches
    
    * Refresh patches
    * Drop most patches, superseded upstream
---
 debian/changelog                                   |  2 ++
 ...1-Remove-requires-of-rubygems-and-bundler.patch | 12 -------
 .../0002-Add-missing-require-statement.patch       | 19 -----------
 .../0003-Remove-implicit-dependency-on-chef.patch  | 37 ----------------------
 .../patches/0004-Relax-dependency-on-hashie.patch  | 29 -----------------
 debian/patches/series                              |  3 --
 6 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d26167d..76a374d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 chef-zero (4.4.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refresh patches
+  * Drop most patches, superseded upstream
   * Switch watch file to https
 
  -- Stefano Rivera <stefanor at debian.org>  Thu, 31 Dec 2015 21:53:06 +0200
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 fdcb178..e3f2d9f 100644
--- a/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
+++ b/debian/patches/0001-Remove-requires-of-rubygems-and-bundler.patch
@@ -57,15 +57,3 @@ index 79d92e7..c433c12 100644
  require 'chef_zero/server'
  require 'rspec/core'
  
-diff --git a/spec/run_pedant.rb b/spec/run_pedant.rb
-index 30ffa2d..777daa0 100644
---- a/spec/run_pedant.rb
-+++ b/spec/run_pedant.rb
-@@ -1,7 +1,4 @@
- #!/usr/bin/env ruby
--require 'bundler'
--require 'bundler/setup'
--
- require 'chef_zero/server'
- require 'rspec/core'
- 
diff --git a/debian/patches/0002-Add-missing-require-statement.patch b/debian/patches/0002-Add-missing-require-statement.patch
deleted file mode 100644
index ed5514e..0000000
--- a/debian/patches/0002-Add-missing-require-statement.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat, 13 Jun 2015 16:16:11 -0300
-Subject: Add missing require statement
-
----
- spec/server_spec.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/spec/server_spec.rb b/spec/server_spec.rb
-index 558ef35..0045c21 100644
---- a/spec/server_spec.rb
-+++ b/spec/server_spec.rb
-@@ -1,5 +1,6 @@
- require 'chef_zero/server'
- require 'uri'
-+require 'net/http'
- 
- describe ChefZero::Server do
-   context 'with a server bound to port 8889' do
diff --git a/debian/patches/0003-Remove-implicit-dependency-on-chef.patch b/debian/patches/0003-Remove-implicit-dependency-on-chef.patch
deleted file mode 100644
index 6c3d405..0000000
--- a/debian/patches/0003-Remove-implicit-dependency-on-chef.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Sun, 14 Jun 2015 15:57:45 -0300
-Subject: Remove implicit dependency on chef
-
-You don't want chef-zero depending on chef, since chef already depends
-on chef-zero and circular dependencies are a pain to deal with.
-
-This closes issue #136
----
- lib/chef_zero/endpoints/policies_endpoint.rb | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/lib/chef_zero/endpoints/policies_endpoint.rb b/lib/chef_zero/endpoints/policies_endpoint.rb
-index 83d503c..ddb2e9b 100644
---- a/lib/chef_zero/endpoints/policies_endpoint.rb
-+++ b/lib/chef_zero/endpoints/policies_endpoint.rb
-@@ -1,8 +1,5 @@
- require 'ffi_yajl'
- 
--require 'chef/version_class'
--require 'chef/exceptions'
--
- require 'chef_zero/endpoints/rest_object_endpoint'
- require 'chef_zero/chef_data/data_normalizer'
- 
-@@ -142,9 +139,9 @@ module ChefZero
-       end
- 
-       def valid_version?(version_string)
--        Chef::Version.new(version_string)
-+        Gem::Version.new(version_string)
-         true
--      rescue Chef::Exceptions::InvalidCookbookVersion
-+      rescue ArgumentError
-         false
-       end
- 
diff --git a/debian/patches/0004-Relax-dependency-on-hashie.patch b/debian/patches/0004-Relax-dependency-on-hashie.patch
deleted file mode 100644
index f9da9dc..0000000
--- a/debian/patches/0004-Relax-dependency-on-hashie.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Wed, 15 Jul 2015 17:58:49 -0300
-Subject: Relax dependency on hashie
-
----
- metadata.yml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/metadata.yml b/metadata.yml
-index d56eeca..9a50db0 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -28,14 +28,14 @@ dependencies:
-   name: hashie
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
--    - - "~>"
-+    - - ">="
-       - !ruby/object:Gem::Version
-         version: '2.0'
-   type: :runtime
-   prerelease: false
-   version_requirements: !ruby/object:Gem::Requirement
-     requirements:
--    - - "~>"
-+    - - ">="
-       - !ruby/object:Gem::Version
-         version: '2.0'
- - !ruby/object:Gem::Dependency
diff --git a/debian/patches/series b/debian/patches/series
index 800e4b2..eb3c0bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 0001-Remove-requires-of-rubygems-and-bundler.patch
-0002-Add-missing-require-statement.patch
-0001-Remove-implicit-dependency-on-chef.patch
-0004-Relax-dependency-on-hashie.patch

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