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-assets (1.1.3-2) unstable; urgency=low
 .
   * Team upload
   * debian/control:
     + remove obsolete DM-Upload-Allowed flag
     + use canonical URI in Vcs-* fields
     + bump Standards-Version to 3.9.4 (no changes needed)
     + drop transitional packages
   * debian/copyright: use copyright-format/1.0 official URL for Format
   * Use the rake method to run the tests.
     They now can find spec_helper.rb (Closes: #725544)
Author: Cédric Boutillier <boutil@debian.org>
Bug-Debian: http://bugs.debian.org/725544

---
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-assets-1.1.3.orig/spec/spec_helper.rb
+++ ruby-merb-assets-1.1.3/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require "rubygems"
+#require "rubygems"
 require "json"
 
 # Use current merb-core sources if running from a typical dev checkout.
@@ -10,7 +10,7 @@ require 'merb-core'
 require "merb-assets"
 
 # Satisfies Autotest and anyone else not using the Rake tasks
-require 'spec'
+require 'rspec'
 
 Merb.start :environment => 'test'
 
@@ -18,6 +18,6 @@ Merb::Plugins.config[:asset_helpers][:ma
 Merb::Plugins.config[:asset_helpers][:asset_domain] = "assets%d"
 Merb::Plugins.config[:asset_helpers][:domain] = "my-awesome-domain.com"
 
-Spec::Runner.configure do |config|
+RSpec::Runner.configure do |config|
   config.include Merb::Test::RequestHelper  
 end
