[DRE-commits] [SCM] ruby-tzinfo.git branch, master, updated. debian/0.3.33-2-14-g2c97026

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 2c970269ab68e94b432203c8073c967c9fc1ef66
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sun Jun 2 15:05:43 2013 +0300

    update 0001-disable-tainted-load-test.patch

diff --git a/debian/changelog b/debian/changelog
index 07cccee..0f073a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ruby-tzinfo (0.3.37-1) UNRELEASED; urgency=low
   * Bump Standards-Version to  3.9.4.
   * Remove obsoleted DM-Upload-Allowed.
   * Update Vcs-* fields to use anonscm.debian.org.
+  * Refresh 0001-disable-tainted-load-test.patch.
 
  -- Hleb Valoshka <375gnu at gmail.com>  Sun, 02 Jun 2013 14:54:23 +0300
 
diff --git a/debian/patches/0001-disable-tainted-load-test.patch b/debian/patches/0001-disable-tainted-load-test.patch
index 15cd8df..5e5f8cb 100644
--- a/debian/patches/0001-disable-tainted-load-test.patch
+++ b/debian/patches/0001-disable-tainted-load-test.patch
@@ -12,11 +12,11 @@ index f49a4d8..4f99fbc 100644
 --- a/test/tc_timezone.rb
 +++ b/test/tc_timezone.rb
 @@ -151,7 +151,7 @@ class TCTimezone < Test::Unit::TestCase
-   # Disable test in Ruby 1.9. See:
+   # Disable test in Ruby 1.9 and Ruby 2.0. See:
    # http://groups.google.com/group/ruby-talk-google/browse_thread/thread/170a7205555cedfc
    # It doesn't appear to be possible to require a file from the load path in Ruby 1.9.
--  if RUBY_VERSION !~ /^1.9/
-+  if RUBY_VERSION !~ /^1.9/ and false
+-  if RUBY_VERSION !~ /\A(1\.9|2)\./
++  if RUBY_VERSION !~ /\A(1\.9|2)\./ and false
      def test_get_tainted_not_loaded
        safe_test do
          tz = Timezone.get('Europe/Amsterdam'.taint)

-- 
ruby-tzinfo.git