[DRE-commits] [ruby-hiera] 04/10: removed dont-require-rubygems, default in 1.9/2.0 not needed

[Jonas Genannt]

This is an automated email from the git hooks/post-receive script.

hggh-guest pushed a commit to branch master
in repository ruby-hiera.

commit 0aa21aeb8193ddbd7d93ca92151497243cefc69b
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Fri Oct 18 20:17:39 2013 +0200

    removed dont-require-rubygems, default in 1.9/2.0 not needed
---
 debian/patches/dont-require-rubygems |   42 ----------------------------------
 debian/patches/series                |    1 -
 2 files changed, 43 deletions(-)

diff --git a/debian/patches/dont-require-rubygems b/debian/patches/dont-require-rubygems
deleted file mode 100644
index 6400958..0000000
--- a/debian/patches/dont-require-rubygems
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: don't require rubygems, as the package is debianized.
- Removing all calls to the rubygems framework is enforced by the 'pkg-ruby-extra'-team policy.
-Forwarded: not-needed
-Origin: vendor
-Author: Patrick Ringl <patrick_ at freenet.de>
-
---- a/bin/hiera
-+++ b/bin/hiera
-@@ -11,16 +11,6 @@
- #
- # $ hiera release 'rel/%{location}' location=dc2 --yaml some.node.yaml
- 
--# Bundler and rubygems maintain a set of directories from which to
--# load gems. If Bundler is loaded, let it determine what can be
--# loaded. If it's not loaded, then use rubygems. But do this before
--# loading any hiera code, so that our gem loading system is sane.
--if not defined? ::Bundler
--  begin
--    require 'rubygems'
--  rescue LoadError
--  end
--end
- require 'hiera'
- require 'hiera/util'
- require 'optparse'
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,6 +1,5 @@
- $:.insert(0, File.join([File.dirname(__FILE__), "..", "lib"]))
- 
--require 'rubygems'
- require 'rspec'
- require 'mocha'
- require 'hiera'
---- a/Rakefile
-+++ b/Rakefile
-@@ -1,5 +1,4 @@
- begin
--  require 'rubygems'
-   require 'rspec/core/rake_task'
- rescue LoadError
- end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 281b00c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dont-require-rubygems

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hiera.git