Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 ruby-merb-helpers (1.1.3-1) unstable; urgency=low
 .
   * Update to new Ruby policy
Author: Tollef Fog Heen <tfheen@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- ruby-merb-helpers-1.1.3.orig/spec/spec_helper.rb
+++ ruby-merb-helpers-1.1.3/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require "rubygems"
+# require "rubygems"
 
 # Use current merb-core sources if running from a typical dev checkout.
 lib = File.expand_path('../../../merb-core/lib', __FILE__)
@@ -9,10 +9,9 @@ require 'merb-core'
 require "merb-helpers"
 
 # Satisfies Autotest and anyone else not using the Rake tasks
-require 'spec'
+require 'rspec'
 
 require "date"
-require "webrat"
 
 
 # Please read merb_helpers_form_spec.rb
@@ -144,12 +143,10 @@ module Merb
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec::Runner.configure do |config|
   config.include Merb::Test::Helper
   config.include Merb::Test::RspecMatchers
   config.include Merb::Test::RequestHelper
-  config.include Webrat::Matchers
-  config.include Webrat::HaveTagMatcher
 
   def with_level(level)
     Merb.logger = Merb::Logger.new(StringIO.new, level)
