[DRE-commits] [ruby-responders] 02/05: New upstream version - 2.1.1

[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-responders.

commit 79e5104b2a6e9035108d3b1721be6ecf97522cdb
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Wed Mar 2 16:01:09 2016 -0300

    New upstream version - 2.1.1
    
    A new upstream version was released and some patches were already applied on
    this upstram version, therefore some of them were excluded.
    
    Signed-off-by: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
---
 debian/changelog                      |  7 +++++
 debian/patches/gemspec_loadpath.patch | 21 ---------------
 debian/patches/rails-compat.patch     | 51 -----------------------------------
 debian/patches/series                 |  2 --
 4 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3074341..00b43f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-responders (2.1.1-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>  Wed, 02 Mar 2016 15:50:01 -0300
+
 ruby-responders (2.1.0-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/gemspec_loadpath.patch b/debian/patches/gemspec_loadpath.patch
deleted file mode 100644
index 731b6c2..0000000
--- a/debian/patches/gemspec_loadpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7c376d6613e4d10900803a1e562dfa3bbbf5c1b3 Mon Sep 17 00:00:00 2001
-From: Praveen Arimbrathodiyil <praveen at debian.org>
-Date: Fri, 28 Aug 2015 22:45:39 +0530
-Subject: [PATCH] use unshift for load path
-
-when an older version is already installed, generated gemspec file gets wrong version (noticed in debian package)
----
- responders.gemspec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/responders.gemspec b/responders.gemspec
-index cdae6ef..fc91518 100644
---- a/responders.gemspec
-+++ b/responders.gemspec
-@@ -1,5 +1,5 @@
- # -*- encoding: utf-8 -*-
--$:.push File.expand_path("../lib", __FILE__)
-+$:.unshift File.expand_path("../lib", __FILE__)
- require "responders/version"
- 
- Gem::Specification.new do |s|
diff --git a/debian/patches/rails-compat.patch b/debian/patches/rails-compat.patch
deleted file mode 100644
index 89da8a5..0000000
--- a/debian/patches/rails-compat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e4da9c86255e5e085b9ac683e1253c451a3163e2 Mon Sep 17 00:00:00 2001
-From: Carlos Antonio da Silva <carlosantoniodasilva at gmail.com>
-Date: Tue, 24 Mar 2015 08:54:50 -0300
-Subject: [PATCH] Update dependencies to Rails 4.1 and fix failures
-
-The change on our tests was necessary due to a bug in Rails.
-More background on c3e2d049e596bc0a76cbc0d1ef298de4926bed16.
----
- test/action_controller/respond_with_test.rb |  8 +++----
-
-
-diff --git a/test/action_controller/respond_with_test.rb b/test/action_controller/respond_with_test.rb
-index 94ae293..9596380 100644
---- a/test/action_controller/respond_with_test.rb
-+++ b/test/action_controller/respond_with_test.rb
-@@ -410,7 +410,7 @@ def test_using_resource_for_put_with_xml_yields_no_content_on_success
-     put :using_resource
-     assert_equal "application/xml", @response.content_type
-     assert_equal 204, @response.status
--    assert_equal " ", @response.body
-+    assert_equal "", @response.body
-   end
- 
-   def test_using_resource_for_put_with_json_yields_no_content_on_success
-@@ -418,7 +418,7 @@ def test_using_resource_for_put_with_json_yields_no_content_on_success
-     put :using_resource_with_json
-     assert_equal "application/json", @response.content_type
-     assert_equal 204, @response.status
--    assert_equal " ", @response.body
-+    assert_equal "", @response.body
-   end
- 
-   def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
-@@ -460,7 +460,7 @@ def test_using_resource_for_delete_with_xml_yields_no_content_on_success
-     delete :using_resource
-     assert_equal "application/xml", @response.content_type
-     assert_equal 204, @response.status
--    assert_equal " ", @response.body
-+    assert_equal "", @response.body
-   end
- 
-   def test_using_resource_for_delete_with_json_yields_no_content_on_success
-@@ -469,7 +469,7 @@ def test_using_resource_for_delete_with_json_yields_no_content_on_success
-     delete :using_resource_with_json
-     assert_equal "application/json", @response.content_type
-     assert_equal 204, @response.status
--    assert_equal " ", @response.body
-+    assert_equal "", @response.body
-   end
- 
-   def test_using_resource_for_delete_with_html_redirects_on_failure
diff --git a/debian/patches/series b/debian/patches/series
index d9f9bd2..ffe9838 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-gemspec_loadpath.patch
 Bundler
-rails-compat.patch
 test-against-rails4.1.patch

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