[DRE-commits] [ruby-grape] 03/04: Update patch 0002 for new upstream release

[Lucas Moura]

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

lucasmoura-guest pushed a commit to branch master
in repository ruby-grape.

commit 0f1bf7d8924691c62c9b146aad4df207c0e4a95e
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Tue Mar 8 13:52:28 2016 -0300

    Update patch 0002 for new upstream release
---
 debian/changelog                                         |  1 +
 .../0002-Allow-release-absence-in-Rack.release.patch     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 806aa1c..e2d5e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-grape (0.14.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+  * Update patch 0002 for new upstream release 
 
  -- Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>  Tue, 08 Mar 2016 13:42:25 -0300
 
diff --git a/debian/patches/0002-Allow-release-absence-in-Rack.release.patch b/debian/patches/0002-Allow-release-absence-in-Rack.release.patch
index 7c96a38..7a5e98e 100644
--- a/debian/patches/0002-Allow-release-absence-in-Rack.release.patch
+++ b/debian/patches/0002-Allow-release-absence-in-Rack.release.patch
@@ -6,15 +6,15 @@ Subject: Allow release absence in Rack.release
  spec/grape/integration/rack_spec.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/spec/grape/integration/rack_spec.rb b/spec/grape/integration/rack_spec.rb
-index 259deef..1b48597 100644
---- a/spec/grape/integration/rack_spec.rb
-+++ b/spec/grape/integration/rack_spec.rb
-@@ -21,7 +21,7 @@ describe Rack do
- 
+Index: ruby-grape/spec/grape/integration/rack_spec.rb
+===================================================================
+--- ruby-grape.orig/spec/grape/integration/rack_spec.rb	2016-03-08 13:45:00.681124897 -0300
++++ ruby-grape/spec/grape/integration/rack_spec.rb	2016-03-08 13:47:00.048988081 -0300
+@@ -22,7 +22,7 @@
        unless RUBY_PLATFORM == 'java'
-         major, minor, release = Rack.release.split('.').map(&:to_i)
--        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 1 && ((minor == 5 && release >= 3) || (minor >= 6))
+         major, minor, patch = Rack.release.split('.').map(&:to_i)
+         patch ||= 0 # rack <= 1.5.2 does not specify patch version
+-        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6))
 +        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 1 && ((minor == 5 && release && release >= 3) || (minor >= 6))
        end
  

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