[DRE-commits] [SCM] ruby-domain-name.git branch, master, updated. debian/0.5.2-1-8-g5a9fe68

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 4666b040bfd4aec26c0dad14d609d71e28ec3082
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 28 15:16:24 2012 +0200

    add remove_bundler_rubygems_stuff.patch

diff --git a/debian/patches/remove_bundler_rubygems_stuff.patch b/debian/patches/remove_bundler_rubygems_stuff.patch
new file mode 100644
index 0000000..f4affa1
--- /dev/null
+++ b/debian/patches/remove_bundler_rubygems_stuff.patch
@@ -0,0 +1,29 @@
+Description: disable the use of rubygems/bundler in tests
+ not needed since all dependencies are provided as Debian packages
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-06-27
+
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,12 +1,12 @@
+-require 'rubygems'
+-require 'bundler'
+-begin
+-  Bundler.setup(:default, :development)
+-rescue Bundler::BundlerError => e
+-  $stderr.puts e.message
+-  $stderr.puts "Run `bundle install` to install missing gems"
+-  exit e.status_code
+-end
++# require 'rubygems'
++# require 'bundler'
++# begin
++#   Bundler.setup(:default, :development)
++# rescue Bundler::BundlerError => e
++#   $stderr.puts e.message
++#   $stderr.puts "Run `bundle install` to install missing gems"
++#   exit e.status_code
++# end
+ require 'test/unit'
+ require 'shoulda'
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f0042d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_bundler_rubygems_stuff.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

-- 
ruby-domain-name.git