[DRE-commits] [ruby-i18n] 01/03: make tests pass on ruby2.2

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-i18n.

commit 0c5e8328e20ce6851bdff788035c803b91552034
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jul 31 09:09:28 2015 -0300

    make tests pass on ruby2.2
---
 debian/changelog                                   |  4 +++
 .../Ignore-metadata-on-frozen-objects.patch        | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9329ff3..78951e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 ruby-i18n (0.7.0-1) UNRELEASED; urgency=medium
 
+  [ Pirate Praveen ]
   * Team upload.
   * New upstream release.
   * Refresh patches.
   * Remove patch i18n_set.patch (already applied).
 
+  [ Antonio Terceiro ]
+  * Ignore-metadata-on-frozen-objects.patch: make tests pass on ruby2.2
+
  -- Pirate Praveen <praveen at debian.org>  Tue, 28 Jul 2015 22:06:48 +0530
 
 ruby-i18n (0.6.11-2) unstable; urgency=medium
diff --git a/debian/patches/Ignore-metadata-on-frozen-objects.patch b/debian/patches/Ignore-metadata-on-frozen-objects.patch
new file mode 100644
index 0000000..6573fe0
--- /dev/null
+++ b/debian/patches/Ignore-metadata-on-frozen-objects.patch
@@ -0,0 +1,33 @@
+From bbbdedc0c78ec941a84d161d5c610a358310cf99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 20 Jan 2015 14:34:44 +0100
+Subject: [PATCH] Ignore metadata for frozen classes.
+
+https://github.com/svenfuchs/i18n/pull/305
+
+---
+ lib/i18n/backend/metadata.rb | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/i18n/backend/metadata.rb b/lib/i18n/backend/metadata.rb
+index 52c0a29..a8d922a 100644
+--- a/lib/i18n/backend/metadata.rb
++++ b/lib/i18n/backend/metadata.rb
+@@ -21,11 +21,15 @@ class << self
+         def included(base)
+           Object.class_eval do
+             def translation_metadata
+-              @translation_metadata ||= {}
++              unless self.frozen?
++                @translation_metadata ||= {}
++              else
++                {}
++              end
+             end
+ 
+             def translation_metadata=(translation_metadata)
+-              @translation_metadata = translation_metadata
++              @translation_metadata = translation_metadata unless self.frozen?
+             end
+           end unless Object.method_defined?(:translation_metadata)
+         end
diff --git a/debian/patches/series b/debian/patches/series
index 0f5f97a..1aa16c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 revert-available-locales-cache.patch
 strip_bundler.patch
+Ignore-metadata-on-frozen-objects.patch

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