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-04-26 08:13:15.000000000 -0400
+++ ruby-rspec-mocks-2.5.0/debian/changelog	2011-07-28 13:37:29.000000000 -0400
@@ -1,3 +1,13 @@
+ruby-rspec-mocks (2.5.0-1ubuntu1~bootstrap1) oneiric; urgency=low
+
+  * Temporarily removing ruby-rspec-expectations and ruby-rspec-core as
+    build-deps as they create a circular build dependency. These packages are
+    necessary for the ruby tests to be executed, so these have been temporarily
+    disabled as well. This upload functions as a bootstrap version of the
+    package.
+
+ -- Brian Thomason <brian.thomason@canonical.com>  Thu, 28 Jul 2011 13:36:40 -0400
+
 ruby-rspec-mocks (2.5.0-1) unstable; urgency=low
 
   * Switch to gem2deb-based packaging and to a more recent upstream release.
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-04-26 08:15:34.000000000 -0400
+++ ruby-rspec-mocks-2.5.0/debian/control	2011-07-28 13:37:40.000000000 -0400
@@ -1,10 +1,11 @@
 Source: ruby-rspec-mocks
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+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), ruby-rspec-expectations, ruby-rspec-core
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
 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-04-26 07:24:49.000000000 -0400
+++ ruby-rspec-mocks-2.5.0/debian/rules	2011-07-28 13:36:30.000000000 -0400
@@ -10,6 +10,7 @@
 #
 # 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