[DRE-commits] [SCM] rubygems.git branch, master, updated. debian/1.8.24-1
Daigo Moriwaki
daigo at debian.org
Sat Jun 9 13:48:35 UTC 2012
The following commit has been merged in the master branch:
commit 579a6cd6adb147f495ce4d614e0bccc339361bfa
Author: Daigo Moriwaki <daigo at debian.org>
Date: Sat Jun 9 20:28:52 2012 +0900
* Added a patch: debian/patches/20120608-fix-test_gem_platform.rb.diff
- Imported from the upstream 4a85e2ac70579c32031766338505e85b2c392b27.
diff --git a/debian/changelog b/debian/changelog
index 8b226f3..f51fa9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ rubygems (1.8.24-1) unstable; urgency=low
* New upstream release.
* debian/control:
- Bumped up Standards-Version to 3.9.3.
+ * Added a patch: debian/patches/20120608-fix-test_gem_platform.rb.diff
+ - Imported from the upstream 4a85e2ac70579c32031766338505e85b2c392b27.
-- Daigo Moriwaki <daigo at debian.org> Sat, 09 Jun 2012 18:22:42 +0900
diff --git a/debian/patches/20120608-fix-test_gem_platform.rb.diff b/debian/patches/20120608-fix-test_gem_platform.rb.diff
new file mode 100644
index 0000000..6baffb0
--- /dev/null
+++ b/debian/patches/20120608-fix-test_gem_platform.rb.diff
@@ -0,0 +1,111 @@
+Index: rubygems/test/rubygems/test_gem_platform.rb
+===================================================================
+--- rubygems.orig/test/rubygems/test_gem_platform.rb 2012-06-09 20:13:11.000000000 +0900
++++ rubygems/test/rubygems/test_gem_platform.rb 2012-06-09 20:24:48.000000000 +0900
+@@ -207,64 +207,71 @@
+ def test_equals_tilde
+ util_set_arch 'i386-mswin32'
+
+- assert_match 'mswin32', Gem::Platform.local
+- assert_match 'i386-mswin32', Gem::Platform.local
++ assert_local_match 'mswin32'
++ assert_local_match 'i386-mswin32'
+
+ # oddballs
+- assert_match 'i386-mswin32-mq5.3', Gem::Platform.local
+- assert_match 'i386-mswin32-mq6', Gem::Platform.local
+- refute_match 'win32-1.8.2-VC7', Gem::Platform.local
+- refute_match 'win32-1.8.4-VC6', Gem::Platform.local
+- refute_match 'win32-source', Gem::Platform.local
+- refute_match 'windows', Gem::Platform.local
++ assert_local_match 'i386-mswin32-mq5.3'
++ assert_local_match 'i386-mswin32-mq6'
++ refute_local_match 'win32-1.8.2-VC7'
++ refute_local_match 'win32-1.8.4-VC6'
++ refute_local_match 'win32-source'
++ refute_local_match 'windows'
+
+ util_set_arch 'i686-linux'
+- assert_match 'i486-linux', Gem::Platform.local
+- assert_match 'i586-linux', Gem::Platform.local
+- assert_match 'i686-linux', Gem::Platform.local
++ assert_local_match 'i486-linux'
++ assert_local_match 'i586-linux'
++ assert_local_match 'i686-linux'
+
+ util_set_arch 'i686-darwin8'
+- assert_match 'i686-darwin8.4.1', Gem::Platform.local
+- assert_match 'i686-darwin8.8.2', Gem::Platform.local
++ assert_local_match 'i686-darwin8.4.1'
++ assert_local_match 'i686-darwin8.8.2'
+
+ util_set_arch 'java'
+- assert_match 'java', Gem::Platform.local
+- assert_match 'jruby', Gem::Platform.local
++ assert_local_match 'java'
++ assert_local_match 'jruby'
+
+ util_set_arch 'universal-dotnet2.0'
+- assert_match 'universal-dotnet', Gem::Platform.local
+- assert_match 'universal-dotnet-2.0', Gem::Platform.local
+- refute_match 'universal-dotnet-4.0', Gem::Platform.local
+- assert_match 'dotnet', Gem::Platform.local
+- assert_match 'dotnet-2.0', Gem::Platform.local
+- refute_match 'dotnet-4.0', Gem::Platform.local
++ assert_local_match 'universal-dotnet'
++ assert_local_match 'universal-dotnet-2.0'
++ refute_local_match 'universal-dotnet-4.0'
++ assert_local_match 'dotnet'
++ assert_local_match 'dotnet-2.0'
++ refute_local_match 'dotnet-4.0'
+
+ util_set_arch 'universal-dotnet4.0'
+- assert_match 'universal-dotnet', Gem::Platform.local
+- refute_match 'universal-dotnet-2.0', Gem::Platform.local
+- assert_match 'universal-dotnet-4.0', Gem::Platform.local
+- assert_match 'dotnet', Gem::Platform.local
+- refute_match 'dotnet-2.0', Gem::Platform.local
+- assert_match 'dotnet-4.0', Gem::Platform.local
++ assert_local_match 'universal-dotnet'
++ refute_local_match 'universal-dotnet-2.0'
++ assert_local_match 'universal-dotnet-4.0'
++ assert_local_match 'dotnet'
++ refute_local_match 'dotnet-2.0'
++ assert_local_match 'dotnet-4.0'
+
+ util_set_arch 'universal-macruby-1.0'
+- assert_match 'universal-macruby', Gem::Platform.local
+- assert_match 'macruby', Gem::Platform.local
+- refute_match 'universal-macruby-0.10', Gem::Platform.local
+- assert_match 'universal-macruby-1.0', Gem::Platform.local
++ assert_local_match 'universal-macruby'
++ assert_local_match 'macruby'
++ refute_local_match 'universal-macruby-0.10'
++ assert_local_match 'universal-macruby-1.0'
+
+ util_set_arch 'powerpc-darwin'
+- assert_match 'powerpc-darwin', Gem::Platform.local
++ assert_local_match 'powerpc-darwin'
+
+ util_set_arch 'powerpc-darwin7'
+- assert_match 'powerpc-darwin7.9.0', Gem::Platform.local
++ assert_local_match 'powerpc-darwin7.9.0'
+
+ util_set_arch 'powerpc-darwin8'
+- assert_match 'powerpc-darwin8.10.0', Gem::Platform.local
++ assert_local_match 'powerpc-darwin8.10.0'
+
+ util_set_arch 'sparc-solaris2.8'
+- assert_match 'sparc-solaris2.8-mq5.3', Gem::Platform.local
++ assert_local_match 'sparc-solaris2.8-mq5.3'
+ end
+
++ def assert_local_match name
++ assert_match Gem::Platform.local, name
++ end
++
++ def refute_local_match name
++ refute_match Gem::Platform.local, name
++ end
+ end
+
diff --git a/debian/patches/series b/debian/patches/series
index ec4ae79..38999c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
disable-failing-tests.diff
disable-tests-failing-as-root.diff
fix-shebang.diff
+20120608-fix-test_gem_platform.rb.diff
--
rubygems.git
More information about the Pkg-ruby-extras-commits
mailing list