[DRE-commits] [SCM] ruby-warden.git branch, master, updated. upstream/1.2.1-8-gb09f0a7

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit b09f0a79663270b4f85ae75b5c72999e6a990165
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Mar 14 00:05:40 2013 +0530

    remove explicit_require_rspec.patch
    
    - not required with ruby-tests.rake

diff --git a/debian/changelog b/debian/changelog
index f1cc9ba..d82848a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-warden (1.2.1-3) UNRELEASED; urgency=low
+
+  * Remove explicit_require_rspec.patch 
+
+ -- Praveen Arimbrathodiyil <praveen at debian.org>  Thu, 14 Mar 2013 00:04:23 +0530
+
 ruby-warden (1.2.1-2) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/patches/explicit_require_rspec.patch b/debian/patches/explicit_require_rspec.patch
deleted file mode 100644
index 0623574..0000000
--- a/debian/patches/explicit_require_rspec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add explicit require rspec
- This is needed for running tests with gem2deb
-Forwarded: https://github.com/hassox/warden/pull/64
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -7,6 +7,7 @@
- 
- require 'rubygems'
- require 'rack'
-+require 'rspec'
- 
- Dir[File.join(File.dirname(__FILE__), "helpers", "**/*.rb")].each do |f|
-   require f
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a79c631..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-explicit_require_rspec.patch

-- 
ruby-warden.git