From 4112d19049e27162c333bac13d908f48a4cc438a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 2 Aug 2015 11:53:14 +0200
Subject: Imported Upstream version 2.3.6

---
 bin/restore.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'bin/restore.sh')

diff --git a/bin/restore.sh b/bin/restore.sh
index 15c3aad..d801c08 100644
--- a/bin/restore.sh
+++ b/bin/restore.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 #
-# Simple hack script to restore __revision__, __COPYRIGHT_, 2.3.5
+# Simple hack script to restore __revision__, __COPYRIGHT_, 2.3.6
 # and other similar variables to what gets checked in to source.  This
 # comes in handy when people send in diffs based on the released source.
 #
@@ -24,7 +24,7 @@ for i in `find $DIRS -name '*.py'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
 w
-/^__revision__ = /s/= .*/= "bin/restore.sh pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"/p
+/^__revision__ = /s/= .*/= "bin/restore.sh rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"/p
 w
 q
 EOF
@@ -35,7 +35,7 @@ for i in `find $DIRS -name 'scons.bat'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
 w
-/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog/p
+/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog/p
 w
 q
 EOF
@@ -44,13 +44,13 @@ done
 for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do
     header $i
     ed $i <<EOF
-/^__version__ = /s/= .*/= "2.3.5"/p
+/^__version__ = /s/= .*/= "2.3.6"/p
 w
-/^__build__ = /s/= .*/= ""/p
+/^__build__ = /s/= .*/= "rel_2.3.5:3347:d31d5a4e74b6[MODIFIED]"/p
 w
-/^__buildsys__ = /s/= .*/= "ubuntu1404-32bit"/p
+/^__buildsys__ = /s/= .*/= "hpmicrodog"/p
 w
-/^__date__ = /s/= .*/= "2015/06/18 06:53:27"/p
+/^__date__ = /s/= .*/= "2015/07/31 14:36:10"/p
 w
 /^__developer__ = /s/= .*/= "bdbaddog"/p
 w
@@ -61,7 +61,7 @@ done
 for i in `find $DIRS -name 'setup.py'`; do
     header $i
     ed $i <<EOF
-/^ *version = /s/= .*/= "2.3.5",/p
+/^ *version = /s/= .*/= "2.3.6",/p
 w
 q
 EOF
@@ -72,9 +72,9 @@ for i in `find $DIRS -name '*.txt'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
 w
-/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog/p
+/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog/p
 w
-/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.5/p
+/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.3.6/p
 w
 q
 EOF
-- 
cgit v1.2.3