[DRE-commits] [SCM] bundler.git branch, master, updated. upstream/1.0.21-11-gfa5c29c

[Christian Hofstaedtler]

The following commit has been merged in the master branch:
commit 494baa18ac1992e6429c088ccd0bb84ff8101949
Author: Christian Hofstaedtler <christian at hofstaedtler.name>
Date:   Mon Mar 12 21:18:40 2012 +0100

    Switch to explicit require-rubygems overrides

diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
new file mode 100644
index 0000000..e185b08
--- /dev/null
+++ b/debian/require-rubygems.overrides
@@ -0,0 +1,12 @@
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/cli.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/dependency.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/fetcher.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/gem_installer.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/installer.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/lazy_specification.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/remote_specification.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/rubygems_ext.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/shared_helpers.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/source.rb
+debian/bundler/usr/lib/ruby/vendor_ruby/bundler/ui.rb
diff --git a/debian/rules b/debian/rules
index e20e66a..2ccb6ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-export DH_RUBY_IGNORE_TESTS=require-rubygems
+#export DH_RUBY_IGNORE_TESTS=ruby1.8
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

-- 
bundler.git