nagachika	2013-03-11 01:01:06 +0900 (Mon, 11 Mar 2013)

  New Revision: 39705

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

  Log:
    merge revision(s) 39492: [Backport #6807]
    
    * common.mk (realclean-local): miniprelude.c is made by srcs, so it
      should not removed by distclean but by realclean.  [Bug #6807]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/common.mk
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39704)
+++ ruby_2_0_0/ChangeLog	(revision 39705)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 11 00:58:30 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (realclean-local): miniprelude.c is made by srcs, so it
+	  should not removed by distclean but by realclean.  [Bug #6807]
+
 Mon Mar 11 00:54:30 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
Index: ruby_2_0_0/common.mk
===================================================================
--- ruby_2_0_0/common.mk	(revision 39704)
+++ ruby_2_0_0/common.mk	(revision 39705)
@@ -454,7 +454,7 @@ clean-docs: clean-rdoc clean-capi https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/common.mk#L454
 distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
 distclean-local:: clean-local
 	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc
-	$(Q)$(RM) config.cache config.status config.status.lineno $(PRELUDES)
+	$(Q)$(RM) config.cache config.status config.status.lineno
 	$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
 distclean-ext:: PHONY
 distclean-golf: clean-golf
@@ -466,7 +466,7 @@ distclean-platform: clean-platform https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/common.mk#L466
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h
+	$(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
 realclean-ext::
 realclean-golf: distclean-golf
 realclean-capi: PHONY
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39704)
+++ ruby_2_0_0/version.h	(revision 39705)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-11"
-#define RUBY_PATCHLEVEL 49
+#define RUBY_PATCHLEVEL 50
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39492


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