[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.12-1-g067a416

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 067a416d4c9c5aff245ff570aa1590e224a7334b
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Dec 21 21:19:04 2011 +0100

    replace require 'yaml' by Gem.load_yaml
    
    rubygems 1.8.12 needs a constant Gem;:SyckDefaultKey which is ensured to
    be defined if yaml is loaded by calling Gem.load_yaml.

diff --git a/debian/changelog b/debian/changelog
index ce87884..4b49a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gem2deb (0.2.13) unstable; urgency=low
+
+  * Use Gem.load_yaml to require yaml, in order to ensure the definition of
+    the constant Gem::SyckDefaultKey, required by newer versions of rubygems.
+
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Wed, 21 Dec 2011 21:14:44 +0100
+
 gem2deb (0.2.12) unstable; urgency=low
 
   * Added myself to uploaders
diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 3cfa355..0606095 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -18,11 +18,12 @@
 require 'gem2deb'
 require 'gem2deb/metadata'
 require 'rubygems'
-require 'yaml'
 require 'fileutils'
 require 'erb'
 require 'date'
 
+Gem.load_yaml
+
 module Gem2Deb
 
   class DhMakeRuby
diff --git a/lib/gem2deb/extension_builder.rb b/lib/gem2deb/extension_builder.rb
index 5efca0d..5a9c0a1 100644
--- a/lib/gem2deb/extension_builder.rb
+++ b/lib/gem2deb/extension_builder.rb
@@ -14,11 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gem2deb'
-require 'yaml'
 require 'rubygems/ext'
-require 'yaml'
 require 'gem2deb/metadata'
 
+Gem.load_yaml
+
 module Gem2Deb
   class ExtensionBuilder
 
diff --git a/lib/gem2deb/metadata.rb b/lib/gem2deb/metadata.rb
index a3be333..c3f1db2 100644
--- a/lib/gem2deb/metadata.rb
+++ b/lib/gem2deb/metadata.rb
@@ -15,7 +15,8 @@
 
 require 'rubygems'
 require 'rubygems/specification'
-require 'yaml'
+
+Gem.load_yaml
 
 module Gem2Deb
   class Metadata

-- 
gem2deb.git