[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.16-4-g21b0806

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 89afa2e6af7aac624d1554613e76adad78cc36ad
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jun 14 22:00:31 2012 -0300

    Drop temporary workaround for Rubygems/YAML issue

diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 4f3c35b..a9be689 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gem2deb'
-require 'gem2deb/yaml'
+require 'yaml'
 require 'gem2deb/metadata'
 require 'rubygems'
 require 'fileutils'
diff --git a/lib/gem2deb/extension_builder.rb b/lib/gem2deb/extension_builder.rb
index 94abfc3..a8adef1 100644
--- a/lib/gem2deb/extension_builder.rb
+++ b/lib/gem2deb/extension_builder.rb
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gem2deb'
-require 'gem2deb/yaml'
+require 'yaml'
 require 'rubygems/ext'
 require 'gem2deb/metadata'
 
diff --git a/lib/gem2deb/metadata.rb b/lib/gem2deb/metadata.rb
index 6a5d2bd..a3be333 100644
--- a/lib/gem2deb/metadata.rb
+++ b/lib/gem2deb/metadata.rb
@@ -15,7 +15,7 @@
 
 require 'rubygems'
 require 'rubygems/specification'
-require 'gem2deb/yaml'
+require 'yaml'
 
 module Gem2Deb
   class Metadata
diff --git a/lib/gem2deb/yaml.rb b/lib/gem2deb/yaml.rb
deleted file mode 100644
index b6b3d80..0000000
--- a/lib/gem2deb/yaml.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-Gem.load_yaml

-- 
gem2deb.git