diff -Nru ruby-rspec-mocks-2.5.0/debian/changelog ruby-rspec-mocks-2.5.0/debian/changelog
--- ruby-rspec-mocks-2.5.0/debian/changelog	2011-07-28 13:37:29.000000000 -0400
+++ ruby-rspec-mocks-2.5.0/debian/changelog	2011-07-29 11:55:47.000000000 -0400
@@ -1,3 +1,10 @@
+ruby-rspec-mocks (2.5.0-1ubuntu1) oneiric; urgency=low
+
+  * Added ruby-rspec-expectations and ruby-rspec-core back as build-deps and
+    re-enabled tests. (LP: #817664)
+
+ -- Brian Thomason <brian.thomason@canonical.com>  Thu, 28 Jul 2011 19:15:33 -0400
+
 ruby-rspec-mocks (2.5.0-1ubuntu1~bootstrap1) oneiric; urgency=low
 
   * Temporarily removing ruby-rspec-expectations and ruby-rspec-core as
diff -Nru ruby-rspec-mocks-2.5.0/debian/control ruby-rspec-mocks-2.5.0/debian/control
--- ruby-rspec-mocks-2.5.0/debian/control	2011-07-28 13:37:40.000000000 -0400
+++ ruby-rspec-mocks-2.5.0/debian/control	2011-07-28 19:16:25.000000000 -0400
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas@lucas-nussbaum.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-rspec-expectations, ruby-rspec-core
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rspec-mocks.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rspec-mocks.git;a=summary
diff -Nru ruby-rspec-mocks-2.5.0/debian/rules ruby-rspec-mocks-2.5.0/debian/rules
--- ruby-rspec-mocks-2.5.0/debian/rules	2011-07-28 13:36:30.000000000 -0400
+++ ruby-rspec-mocks-2.5.0/debian/rules	2011-04-26 07:24:49.000000000 -0400
@@ -10,7 +10,6 @@
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
-export DEB_BUILD_OPTIONS=nocheck git-buildpackage
 
 %:
 	dh $@ --buildsystem=ruby --with ruby