From 1d3de8cda278418e624c7c808e12ab069d514c69 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sun, 3 Mar 2013 22:04:41 -0500 Subject: Move back to 'develop' mode after rel_2.3.0. --- QMTest/TestSCons.py | 2 +- README.rst | 16 ++++++++-------- ReleaseConfig | 2 +- SConstruct | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 5 +++++ 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 6f6beb1..84cc60f 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.3.0' +default_version = '2.3.1.alpha.yyyymmdd' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013' diff --git a/README.rst b/README.rst index 2d09018..63e507a 100644 --- a/README.rst +++ b/README.rst @@ -480,14 +480,14 @@ following packages will be built:: build/dist/scons-2.0.0-1.noarch.rpm build/dist/scons-2.0.0-1.src.rpm build/dist/scons-2.0.0.linux-i686.tar.gz - build/dist/scons-2.3.0.tar.gz - build/dist/scons-2.3.0.win32.exe - build/dist/scons-2.3.0.zip - build/dist/scons-doc-2.3.0.tar.gz - build/dist/scons-local-2.3.0.tar.gz - build/dist/scons-local-2.3.0.zip - build/dist/scons-src-2.3.0.tar.gz - build/dist/scons-src-2.3.0.zip + build/dist/scons-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-2.3.1.alpha.yyyymmdd.win32.exe + build/dist/scons-2.3.1.alpha.yyyymmdd.zip + build/dist/scons-doc-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-local-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-local-2.3.1.alpha.yyyymmdd.zip + build/dist/scons-src-2.3.1.alpha.yyyymmdd.tar.gz + build/dist/scons-src-2.3.1.alpha.yyyymmdd.zip build/dist/scons_1.3.0-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build diff --git a/ReleaseConfig b/ReleaseConfig index b64ebc0..2beab02 100644 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" # 'final', the patchlevel is set to the release date. This value is # mandatory and must be present in this file. #version_tuple = (2, 2, 0, 'final', 0) -version_tuple = (2, 3, 0) +version_tuple = (2, 3, 1, 'alpha', 0) # Python versions prior to unsupported_python_version cause a fatal error # when that version is used. Python versions prior to deprecate_python_version diff --git a/SConstruct b/SConstruct index f55634b..4aa6df8 100644 --- a/SConstruct +++ b/SConstruct @@ -8,7 +8,7 @@ copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013' # This gets inserted into the man pages to reflect the month of release. -month_year = 'March 2013' +month_year = 'MONTH YEAR' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import sys import tempfile project = 'scons' -default_version = '2.3.0' +default_version = '2.3.1.alpha.yyyymmdd' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/src/Announce.txt b/src/Announce.txt index 4f7558b..7bc62ab 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for the scons-users mailing list. -RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400 +RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE Please consult the RELEASE.txt file for a summary of changes since the last release and consult the CHANGES.txt file for complete a list of changes diff --git a/src/CHANGES.txt b/src/CHANGES.txt index e0a4fb5..267c7ac 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,6 +4,11 @@ Change Log +RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + + From XXX: + - first change here + RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400 From Anatoly Techtonik: -- cgit v0.12