usa	2015-07-07 13:37:55 +0900 (Tue, 07 Jul 2015)

  New Revision: 51177

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51177

  Log:
    merge revision(s) 50860: [Backport #11249]
    
    * ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem.
      [fix GH-929] Patch by @voxik
    
    * ext/io/console/io-console.gemspec: ditto.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/bigdecimal/bigdecimal.gemspec
    branches/ruby_2_1/ext/io/console/io-console.gemspec
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 51176)
+++ ruby_2_1/ChangeLog	(revision 51177)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Jul  7 13:37:34 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem.
+	  [fix GH-929] Patch by @voxik
+	* ext/io/console/io-console.gemspec: ditto.
+
 Fri Jul  3 21:54:46 2015  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
Index: ruby_2_1/ext/bigdecimal/bigdecimal.gemspec
===================================================================
--- ruby_2_1/ext/bigdecimal/bigdecimal.gemspec	(revision 51176)
+++ ruby_2_1/ext/bigdecimal/bigdecimal.gemspec	(revision 51177)
@@ -12,7 +12,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/bigdecimal/bigdecimal.gemspec#L12
   s.email = "mrkn@m..."
   s.description = "This library provides arbitrary-precision decimal floating-point number class."
   s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
-  s.require_path = %[.]
+  s.require_path = %[lib]
   s.files = %w[
     bigdecimal.gemspec
     bigdecimal.c
Index: ruby_2_1/ext/io/console/io-console.gemspec
===================================================================
--- ruby_2_1/ext/io/console/io-console.gemspec	(revision 51176)
+++ ruby_2_1/ext/io/console/io-console.gemspec	(revision 51177)
@@ -12,7 +12,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/io/console/io-console.gemspec#L12
   s.required_ruby_version = ">= 2.0.0"
   s.homepage = "http://www.ruby-lang.org"
   s.authors = ["Nobu Nakada"]
-  s.require_path = %[.]
+  s.require_path = %[lib]
   s.files = %w[console.c extconf.rb lib/console/size.rb]
   s.extensions = %w[extconf.rb]
   s.licenses = "ruby"
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 51176)
+++ ruby_2_1/version.h	(revision 51177)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-07-07"
-#define RUBY_PATCHLEVEL 377
+#define RUBY_PATCHLEVEL 378
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50860


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/