From 994be38f77017e4bc39be6e00720c8da7eda67a3 Mon Sep 17 00:00:00 2001 From: Christoph Otto Date: Mon, 17 Jan 2011 23:29:47 -0800 Subject: [PATCH] various updates to prepare for 3.0.0 --- ChangeLog | 8 ++++++-- MANIFEST.generated | 4 ++-- README | 2 +- VERSION | 2 +- docs/parrothist.pod | 2 ++ docs/project/release_manager_guide.pod | 3 +-- tools/release/release.json | 14 +++++++------- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index af1f1384e3..2c31d420de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ #1 $Id$ +2011.01.18 cotto + * Released 3.0.0 + See NEWS for more. + 2010.12.21 Whiteknight - * Released 2.11.0 - See NEWS for more. + * Released 2.11.0 + See NEWS for more. 2010.11.16 tcurtis * Released 2.10.0 diff --git a/MANIFEST.generated b/MANIFEST.generated index e895bb0ae7..e27c3badee 100644 --- a/MANIFEST.generated +++ b/MANIFEST.generated @@ -1,11 +1,11 @@ # See tools/dev/install_files.pl for documentation on the # format of this file. # Please re-sort this file after *EVERY* modification -blib/lib/libparrot.2.11.0.dylib [main]lib +blib/lib/libparrot.3.0.0.dylib [main]lib blib/lib/libparrot.a [main]lib blib/lib/libparrot.dylib [main]lib blib/lib/libparrot.so [main]lib -blib/lib/libparrot.so.2.11.0 [main]lib +blib/lib/libparrot.so.3.0.0 [main]lib compilers/data_json/data_json.pbc [data_json] config/gen/call_list/opengl.in [] docs/ops/bit.pod [doc] diff --git a/README b/README index ebf8b0123a..5d526d3f85 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is Parrot, version 2.11.0 +This is Parrot, version 3.0.0 ------------------------------ Parrot is Copyright (C) 2001-2011, Parrot Foundation. diff --git a/VERSION b/VERSION index 46b81d815a..4a36342fca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.11.0 +3.0.0 diff --git a/docs/parrothist.pod b/docs/parrothist.pod index f29f687af6..52ef775618 100644 --- a/docs/parrothist.pod +++ b/docs/parrothist.pod @@ -121,4 +121,6 @@ Starred release numbers indicate supported releases. Gerd 2.10.1 2010-Nov-18 (bugfix release) Whiteknight 2.11.0 2010-Dec-21 "At The ROFLBBQ" + cotto 3.0.0 * 2011-Jan-18 "Beef Stew" + =cut diff --git a/docs/project/release_manager_guide.pod b/docs/project/release_manager_guide.pod index 8a147b033c..8c604b6d57 100644 --- a/docs/project/release_manager_guide.pod +++ b/docs/project/release_manager_guide.pod @@ -59,7 +59,7 @@ Make sure you have the most recent version of the master branch: Also be sure you do not have any local commits that have not yet been pushed out and tested thoroughly. You can check for this with - git log ..origin/master + git log origin/master.. If there is no output from that command, then your local master and the master on origin are in sync. @@ -429,7 +429,6 @@ The calendar of releases is available at the comp.lang.parrot google calendar, visible at L. - - Jan 18, 2011 - 3.0* - cotto - Feb 15, 2011 - 3.1 - mikehh - Mar 15, 2011 - 3.2 - gerd - Apr 19, 2011 - 3.3* - ?? diff --git a/tools/release/release.json b/tools/release/release.json index 69132e5946..9fd00e6caa 100644 --- a/tools/release/release.json +++ b/tools/release/release.json @@ -1,9 +1,9 @@ { - "release.version" : "2.11.0", - "release.name" : "At The ROFLBBQ", + "release.version" : "3.0.0", + "release.name" : "Beef Stew", "release.day" : "Tuesday", - "release.date" : "21 December 2010", - "release.nextdate" : "18 January 2011", + "release.date" : "18 January 2011", + "release.nextdate" : "15 February 2011", "web.root" : "http://parrot.org/", "web.source" : "download", @@ -12,10 +12,10 @@ "web.org_root" : "https://github.com/parrot", "bugday.day" : "Saturday", - "bugday.date" : "16 January 2011", + "bugday.date" : "12 February 2011", "wiki.root" : "https://trac.parrot.org/parrot/wiki/", - "wiki.bugday" : "bug_day_2011_01_16", + "wiki.bugday" : "bug_day_2011_02_12", - "ftp.path" : "ftp://ftp.parrot.org/pub/parrot/releases/devel/2.11.0/", + "ftp.path" : "ftp://ftp.parrot.org/pub/parrot/releases/stable/3.0.0/", }