[DRE-commits] [chef] 01/07: Refresh patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch patch-queue/master
in repository chef.

commit 762c7c5cb65e9536e42db714f43c7ed4b82a8e8a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 5 10:15:58 2016 -0300

    Refresh patches
---
 debian/changelog                                   |  7 +++++++
 debian/patches/0001-Update-gemspec-file.patch      |  9 +++++----
 .../0002-remove-deprecated-Thread.exclusive.patch  | 23 ----------------------
 ...> 0002-spec-remove-absolute-require-path.patch} |  2 +-
 ...ake-specs-work-against-installed-package.patch} |  2 +-
 debian/patches/series                              |  5 ++---
 6 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58e387c..bf55322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chef (12.10.24-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Refresh patches
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sun, 05 Jun 2016 10:49:39 -0300
+
 chef (12.7.2-1) unstable; urgency=medium
 
   [ Lucas Kanashiro ]
diff --git a/debian/patches/0001-Update-gemspec-file.patch b/debian/patches/0001-Update-gemspec-file.patch
index 08df046..aa3ae7d 100644
--- a/debian/patches/0001-Update-gemspec-file.patch
+++ b/debian/patches/0001-Update-gemspec-file.patch
@@ -9,15 +9,16 @@ requirement
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/chef.gemspec b/chef.gemspec
-index c55b242..42c018b 100644
+index b88c899..73fe36a 100644
 --- a/chef.gemspec
 +++ b/chef.gemspec
-@@ -32,11 +32,10 @@ Gem::Specification.new do |s|
+@@ -33,12 +33,11 @@ Gem::Specification.new do |s|
  
    s.add_dependency "chef-zero", "~> 4.5"
  
--  s.add_dependency "plist", "~> 3.1.0"
-+  s.add_dependency "plist", ">= 3.1.0"
+-  s.add_dependency "plist", "~> 3.2"
++  s.add_dependency "plist", ">= 3.2"
+   s.add_dependency "iniparse", "~> 1.4"
  
    # Audit mode requires these, so they are non-developmental dependencies now
    %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.4" }
diff --git a/debian/patches/0002-remove-deprecated-Thread.exclusive.patch b/debian/patches/0002-remove-deprecated-Thread.exclusive.patch
deleted file mode 100644
index e507b2b..0000000
--- a/debian/patches/0002-remove-deprecated-Thread.exclusive.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Nathan Williams <nathan at teamtreehouse.com>
-Date: Thu, 10 Mar 2016 18:22:05 -0800
-Subject: remove deprecated Thread.exclusive
-
----
- lib/chef/dsl/declare_resource.rb | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb
-index 2e7dc93..7efc985 100644
---- a/lib/chef/dsl/declare_resource.rb
-+++ b/lib/chef/dsl/declare_resource.rb
-@@ -88,9 +88,7 @@ class Chef
-       #
-       def build_resource(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
-         created_at ||= caller[0]
--        Thread.exclusive do
--          require "chef/resource_builder" unless defined?(Chef::ResourceBuilder)
--        end
-+        require "chef/resource_builder" unless defined?(Chef::ResourceBuilder)
- 
-         Chef::ResourceBuilder.new(
-           type:                type,
diff --git a/debian/patches/0003-spec-remove-absolute-require-path.patch b/debian/patches/0002-spec-remove-absolute-require-path.patch
similarity index 97%
rename from debian/patches/0003-spec-remove-absolute-require-path.patch
rename to debian/patches/0002-spec-remove-absolute-require-path.patch
index 73f57b7..9557633 100644
--- a/debian/patches/0003-spec-remove-absolute-require-path.patch
+++ b/debian/patches/0002-spec-remove-absolute-require-path.patch
@@ -10,7 +10,7 @@ setup the $LOAD_PATH
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
-index 2f65b6d..4b5bbbf 100644
+index 0adcbbf..bda4b1c 100644
 --- a/spec/unit/chef_fs/config_spec.rb
 +++ b/spec/unit/chef_fs/config_spec.rb
 @@ -18,7 +18,7 @@
diff --git a/debian/patches/0004-Make-specs-work-against-installed-package.patch b/debian/patches/0003-Make-specs-work-against-installed-package.patch
similarity index 99%
rename from debian/patches/0004-Make-specs-work-against-installed-package.patch
rename to debian/patches/0003-Make-specs-work-against-installed-package.patch
index 3165e7e..f7dd95c 100644
--- a/debian/patches/0004-Make-specs-work-against-installed-package.patch
+++ b/debian/patches/0003-Make-specs-work-against-installed-package.patch
@@ -9,7 +9,7 @@ Subject: Make specs work against installed package
  3 files changed, 6 insertions(+), 13 deletions(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 47432f5..985ef99 100644
+index 2f6747c..5eb22c0 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -24,16 +24,9 @@ module Shell
diff --git a/debian/patches/series b/debian/patches/series
index 3fdbcb6..491e0ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Update-gemspec-file.patch
-0002-remove-deprecated-Thread.exclusive.patch
-0003-spec-remove-absolute-require-path.patch
-0004-Make-specs-work-against-installed-package.patch
+0002-spec-remove-absolute-require-path.patch
+0003-Make-specs-work-against-installed-package.patch

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