[DRE-commits] [chef-zero] 02/02: new upstream release + relax hashie dependency

[Antonio Terceiro]

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

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

commit ec75efaacb5458556e354219b9f24f7a50add612
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jul 15 18:00:03 2015 -0300

    new upstream release + relax hashie dependency
---
 debian/changelog                                   |  7 ++++++
 .../0001-Remove-implicit-dependency-on-chef.patch  |  6 +----
 .../patches/0004-Relax-dependency-on-hashie.patch  | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d73efa8..3e1f380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chef-zero (4.2.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * add patch to relax dependency on ruby-hashie
+
+ -- Antonio Terceiro <terceiro at debian.org>  Wed, 15 Jul 2015 18:01:18 -0300
+
 chef-zero (4.2.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0001-Remove-implicit-dependency-on-chef.patch b/debian/patches/0001-Remove-implicit-dependency-on-chef.patch
index 483ecaa..6c3d405 100644
--- a/debian/patches/0001-Remove-implicit-dependency-on-chef.patch
+++ b/debian/patches/0001-Remove-implicit-dependency-on-chef.patch
@@ -1,7 +1,6 @@
-From eb78e23269692086421b35c23857064df8535b34 Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro at debian.org>
 Date: Sun, 14 Jun 2015 15:57:45 -0300
-Subject: [PATCH 1/2] Remove implicit dependency on chef
+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.
@@ -36,6 +35,3 @@ index 83d503c..ddb2e9b 100644
          false
        end
  
--- 
-2.1.4
-
diff --git a/debian/patches/0004-Relax-dependency-on-hashie.patch b/debian/patches/0004-Relax-dependency-on-hashie.patch
new file mode 100644
index 0000000..f9da9dc
--- /dev/null
+++ b/debian/patches/0004-Relax-dependency-on-hashie.patch
@@ -0,0 +1,29 @@
+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 8aaac19..800e4b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 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