ruby-changes:38995
From: nagachika <ko1@a...>
Date: Wed, 1 Jul 2015 04:17:19 +0900 (JST)
Subject: [ruby-changes:38995] nagachika:r51076 (ruby_2_2): merge revision(s) 50860: [Backport #11249]
nagachika 2015-07-01 04:17:07 +0900 (Wed, 01 Jul 2015) New Revision: 51076 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51076 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_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/ext/bigdecimal/bigdecimal.gemspec branches/ruby_2_2/ext/io/console/io-console.gemspec branches/ruby_2_2/version.h Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 51075) +++ ruby_2_2/ChangeLog (revision 51076) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Wed Jul 1 04:16:56 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. + Wed Jul 1 04:15:38 2015 SHIBATA Hiroshi <hsbt@r...> * ext/zlib/zlib.c: Fix indentation for rdoc. Index: ruby_2_2/ext/bigdecimal/bigdecimal.gemspec =================================================================== --- ruby_2_2/ext/bigdecimal/bigdecimal.gemspec (revision 51075) +++ ruby_2_2/ext/bigdecimal/bigdecimal.gemspec (revision 51076) @@ -12,7 +12,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ruby_2_2/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_2/ext/io/console/io-console.gemspec =================================================================== --- ruby_2_2/ext/io/console/io-console.gemspec (revision 51075) +++ ruby_2_2/ext/io/console/io-console.gemspec (revision 51076) @@ -12,7 +12,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ruby_2_2/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_2/version.h =================================================================== --- ruby_2_2/version.h (revision 51075) +++ ruby_2_2/version.h (revision 51076) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-07-01" -#define RUBY_PATCHLEVEL 138 +#define RUBY_PATCHLEVEL 139 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 7 Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r50860 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/