[DRE-commits] [chef] 05/13: debian/patches: refresh patches

[Lucas Kanashiro]

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

kanashiro-guest pushed a commit to branch master
in repository chef.

commit 8a53d9b6e06997d19f52b70c75d0617d98c756e3
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Thu Mar 3 15:22:34 2016 -0300

    debian/patches: refresh patches
    
    * drop patches that try to modify metadata.yml
    * create one that modify gemspec
---
 debian/changelog                                   |  2 ++
 debian/patches/0001-gemspec-update.patch           | 20 +++++++++++++
 ...metadata.yml-remove-rspec-junit-formatter.patch | 33 ----------------------
 .../0002-Relax-dependency-on-ruby-net-ssh.patch    | 30 --------------------
 debian/patches/series                              |  3 +-
 5 files changed, 23 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19c5017..43380c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ chef (12.7.2-1) UNRELEASED; urgency=medium
   * debian/watch: start to watch Github repo instead of rubygems
   * debian/copyright: add chef-windows.gemspec to Files-Excluded field
   * Imported Upstream version 12.7.2
+  * debian/patches: drop patches that try to modify metadata.yml and create
+    one that modify gemspec
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Thu, 03 Mar 2016 15:18:38 -0300
 
diff --git a/debian/patches/0001-gemspec-update.patch b/debian/patches/0001-gemspec-update.patch
new file mode 100644
index 0000000..0c0d4e9
--- /dev/null
+++ b/debian/patches/0001-gemspec-update.patch
@@ -0,0 +1,20 @@
+Description: Update gemspec file
+ Remove rspec-junit-formatter dependency and flex plist version requirement
+Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
+Last-Updated: 2016-04-04
+
+--- a/chef.gemspec
++++ b/chef.gemspec
+@@ -32,11 +32,10 @@ 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"
+ 
+   # 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" }
+-  s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
+   s.add_dependency "serverspec", "~> 2.7"
+   s.add_dependency "specinfra", "~> 2.10"
+ 
diff --git a/debian/patches/0001-metadata.yml-remove-rspec-junit-formatter.patch b/debian/patches/0001-metadata.yml-remove-rspec-junit-formatter.patch
deleted file mode 100644
index 57ec46a..0000000
--- a/debian/patches/0001-metadata.yml-remove-rspec-junit-formatter.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat, 13 Jun 2015 15:53:06 -0300
-Subject: metadata.yml: remove rspec-junit-formatter
-
----
- metadata.yml | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/metadata.yml b/metadata.yml
-index 4bb3d01..596169c 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -287,20 +287,6 @@ dependencies:
-       - !ruby/object:Gem::Version
-         version: '3.2'
- - !ruby/object:Gem::Dependency
--  name: rspec_junit_formatter
--  requirement: !ruby/object:Gem::Requirement
--    requirements:
--    - - "~>"
--      - !ruby/object:Gem::Version
--        version: 0.2.0
--  type: :runtime
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    requirements:
--    - - "~>"
--      - !ruby/object:Gem::Version
--        version: 0.2.0
--- !ruby/object:Gem::Dependency
-   name: serverspec
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
diff --git a/debian/patches/0002-Relax-dependency-on-ruby-net-ssh.patch b/debian/patches/0002-Relax-dependency-on-ruby-net-ssh.patch
deleted file mode 100644
index 69b027b..0000000
--- a/debian/patches/0002-Relax-dependency-on-ruby-net-ssh.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Thu, 28 Jan 2016 10:07:37 -0200
-Subject: Relax dependency on ruby-net-ssh
-
-Reading the CHANGES file there it does not seem we will have a problem
----
- metadata.yml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/metadata.yml b/metadata.yml
-index 596169c..c379c89 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -124,14 +124,14 @@ dependencies:
-   name: net-ssh
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
--    - - "~>"
-+    - - ">="
-       - !ruby/object:Gem::Version
-         version: '2.6'
-   type: :runtime
-   prerelease: false
-   version_requirements: !ruby/object:Gem::Requirement
-     requirements:
--    - - "~>"
-+    - - ">="
-       - !ruby/object:Gem::Version
-         version: '2.6'
- - !ruby/object:Gem::Dependency
diff --git a/debian/patches/series b/debian/patches/series
index 3e9af53..86136dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-metadata.yml-remove-rspec-junit-formatter.patch
-0002-Relax-dependency-on-ruby-net-ssh.patch
+0001-gemspec-update.patch

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