Imported Upstream version 2.3.0upstream/2.3.0

1 files changed, 8 insertions, 9 deletions

diff --git a/SConstruct b/SConstruct
index 43aae5b..6286e43 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,17 +1,17 @@
 #
 # SConstruct file to build scons packages during development.
 #
-# See the README file for an overview of how SCons is built and tested.
+# See the README.rst file for an overview of how SCons is built and tested.
 
 # When this gets changed, you must also change the copyright_years string
 # in QMTest/TestSCons.py so the test scripts look for the right string.
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012'
+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 = 'August 2012'
+month_year = 'March 2013'
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -43,7 +43,7 @@ import sys
 import tempfile
 
 project = 'scons'
-default_version = '2.2.0'
+default_version = '2.3.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
@@ -367,7 +367,7 @@ def SCons_revision(target, source, env):
     contents = contents.replace('__COPYRIGHT' + '__', env['COPYRIGHT'])
     contents = contents.replace('__DATE'      + '__', env['DATE'])
     contents = contents.replace('__DEVELOPER' + '__', env['DEVELOPER'])
-    contents = contents.replace('__FILE'      + '__', str(source[0]))
+    contents = contents.replace('__FILE'      + '__', str(source[0]).replace('\\', '/'))
     contents = contents.replace('__MONTH_YEAR'+ '__', env['MONTH_YEAR'])
     contents = contents.replace('__REVISION'  + '__', env['REVISION'])
     contents = contents.replace('__VERSION'   + '__', env['VERSION'])
@@ -662,7 +662,6 @@ scons = {
                             'LICENSE.txt',
                             'README.txt',
                             'RELEASE.txt',
-                            'os_spawnv_fix.diff',
                             'scons.1',
                             'sconsign.1',
                             'scons-time.1',
@@ -794,7 +793,7 @@ for p in [ scons ]:
 
     #
     # Now run everything in src_file through the sed command we
-    # concocted to expand SConstruct, 2.2.0, etc.
+    # concocted to expand SConstruct, 2.3.0, etc.
     #
     for b in src_files:
         s = p['filemap'].get(b, b)
@@ -1026,7 +1025,7 @@ for p in [ scons ]:
     if dh_builddeb and fakeroot:
         # Our Debian packaging builds directly into build/dist,
         # so we don't need to Install() the .debs.
-        deb = os.path.join(build_dir, 'dist', "%s_%s-1_all.deb" % (pkg, version))
+        deb = os.path.join(build_dir, 'dist', "%s_%s_all.deb" % (pkg, version))
         for d in p['debian_deps']:
             b = env.SCons_revision(os.path.join(build, d), d)
             env.Depends(deb, b)