[DRE-commits] [ruby-mixlib-authentication] 03/08: Drop 0001-make-specs-compatible-with-rspec-3.patch

[Lucas Kanashiro]

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

kanashiro-guest pushed a commit to branch master
in repository ruby-mixlib-authentication.

commit d08f8c8c3c6a20b8881f298265cd3196757dd946
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Thu Mar 3 18:44:01 2016 -0300

    Drop 0001-make-specs-compatible-with-rspec-3.patch
    
    Already applied by upstream
---
 debian/changelog                                    |  2 ++
 .../0001-make-specs-compatible-with-rspec-3.patch   | 21 ---------------------
 debian/patches/series                               |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 44d257a..907386d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-mixlib-authentication (1.4.0-1) UNRELEASED; urgency=medium
 
   * Imported Upstream version 1.4.0
+  * Drop 0001-make-specs-compatible-with-rspec-3.patch, already applied by
+    upstream
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Thu, 03 Mar 2016 18:41:19 -0300
 
diff --git a/debian/patches/0001-make-specs-compatible-with-rspec-3.patch b/debian/patches/0001-make-specs-compatible-with-rspec-3.patch
deleted file mode 100644
index 6b56965..0000000
--- a/debian/patches/0001-make-specs-compatible-with-rspec-3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Fri, 12 Jun 2015 22:38:25 -0300
-Subject: make specs compatible with rspec 3
-
----
- spec/mixlib/authentication/mixlib_authentication_spec.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/mixlib/authentication/mixlib_authentication_spec.rb b/spec/mixlib/authentication/mixlib_authentication_spec.rb
-index c16ab44..5ee29a4 100644
---- a/spec/mixlib/authentication/mixlib_authentication_spec.rb
-+++ b/spec/mixlib/authentication/mixlib_authentication_spec.rb
-@@ -176,7 +176,7 @@ describe "Mixlib::Authentication::SignatureVerification" do
-     headers.delete("HTTP_X_OPS_SIGN")
- 
-     mock_request = MockRequest.new(PATH, MERB_REQUEST_PARAMS, headers, BODY)
--    Time.stub!(:now).and_return(TIMESTAMP_OBJ)
-+    Time.stub(:now).and_return(TIMESTAMP_OBJ)
- 
-     auth_req = Mixlib::Authentication::SignatureVerification.new
-     lambda {auth_req.authenticate_user_request(mock_request, @user_private_key)}.should raise_error(Mixlib::Authentication::AuthenticationError)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9bdd1b1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-make-specs-compatible-with-rspec-3.patch

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