naruse	2014-12-20 04:59:32 +0900 (Sat, 20 Dec 2014)

  New Revision: 48899

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

  Log:
    merge revision(s) 48896: [Backport #10622]
    
    * ext/bigdecimal/depend: Fix dependencies to make bigdecimal
      installable by rubygems.
    
    * ext/bigdecimal/bigdecimal.gemspec: version 1.2.6.

  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/bigdecimal/depend
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 48898)
+++ ruby_2_2/ChangeLog	(revision 48899)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Dec 20 04:58:00 2014  Kenta Murata  <mrkn@c...>
+
+	* ext/bigdecimal/depend: Fix dependencies to make bigdecimal
+	  installable by rubygems.
+
+	* ext/bigdecimal/bigdecimal.gemspec: version 1.2.6.
+
 Thu Dec 18 17:45:26 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (rb_cv_binary_elf): get rid of -e option of cat
Index: ruby_2_2/ext/bigdecimal/depend
===================================================================
--- ruby_2_2/ext/bigdecimal/depend	(revision 48898)
+++ ruby_2_2/ext/bigdecimal/depend	(revision 48899)
@@ -7,7 +7,7 @@ bigdecimal.o: $(hdrdir)/ruby/missing.h https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/bigdecimal/depend#L7
 bigdecimal.o: $(hdrdir)/ruby/st.h
 bigdecimal.o: $(hdrdir)/ruby/subst.h
 bigdecimal.o: $(hdrdir)/ruby/util.h
-bigdecimal.o: $(top_srcdir)/include/ruby/ruby.h
+bigdecimal.o: $(hdrdir)/ruby/ruby.h
 bigdecimal.o: bigdecimal.c
 bigdecimal.o: bigdecimal.h
 # AUTOGENERATED DEPENDENCIES END
Index: ruby_2_2/ext/bigdecimal/bigdecimal.gemspec
===================================================================
--- ruby_2_2/ext/bigdecimal/bigdecimal.gemspec	(revision 48898)
+++ ruby_2_2/ext/bigdecimal/bigdecimal.gemspec	(revision 48899)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/bigdecimal/bigdecimal.gemspec#L1
 # -*- ruby -*-
-_VERSION = "1.2.5"
+_VERSION = "1.2.6"
 date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 48898)
+++ ruby_2_2/version.h	(revision 48899)
@@ -1,11 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2014-12-18"
+#define RUBY_RELEASE_DATE "2014-12-20"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r48896


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