From f681a1fb71c146c754f57508afac240d0e1b47e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 28 Sep 2015 18:52:07 +0200
Subject: Imported Upstream version 2.4.0

---
 doc/generated/examples/caching_ex-random_1.xml       | 4 ++--
 doc/generated/examples/troubleshoot_stacktrace_2.xml | 2 +-
 doc/generated/variables.gen                          | 6 ++----
 doc/man/scons-time.xml                               | 4 ++--
 doc/man/scons.xml                                    | 4 ++--
 doc/man/sconsign.xml                                 | 4 ++--
 6 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 6f64f8f..e7aa631 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f2.o -c f2.c
 cc -o f4.o -c f4.c
-cc -o f3.o -c f3.c
 cc -o f5.o -c f5.c
+cc -o f2.o -c f2.c
+cc -o f3.o -c f3.c
 cc -o f1.o -c f1.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index 1ab65ee..add59ff 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -8,6 +8,6 @@ scons: internal stack trace:
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
   File "bootstrap/src/engine/SCons/Taskmaster.py", line 191, in prepare
     executor.prepare()
-  File "bootstrap/src/engine/SCons/Executor.py", line 396, in prepare
+  File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
 </screen>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index bf18796..04c3efe 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -6753,9 +6753,7 @@ and translated into the
 The list of directories that the scripting language wrapper
 and interface generate will search for included files.
 The SWIG implicit dependency scanner will search these
-directories for include files.
-The default is to use the same path
-specified as <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar>.
+directories for include files. The default value is an empty list.
 </para>
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -6802,7 +6800,7 @@ include <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar>:
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env = Environment(SWIGCOM="my_swig -o $TARGET $_SWIGINCFLAGS $SORUCES")
+env = Environment(SWIGCOM="my_swig -o $TARGET $_SWIGINCFLAGS $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml
index d4ad11f..0601823 100644
--- a/doc/man/scons-time.xml
+++ b/doc/man/scons-time.xml
@@ -32,8 +32,8 @@
 <refmeta>
 <refentrytitle>SCONS-TIME</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.3.6</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.3.6</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.4.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.4.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons-time</refname>
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 5cda24b..460e993 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -75,8 +75,8 @@
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.3.6</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.3.6</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.4.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.4.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons</refname>
diff --git a/doc/man/sconsign.xml b/doc/man/sconsign.xml
index bd26ddf..8cba837 100644
--- a/doc/man/sconsign.xml
+++ b/doc/man/sconsign.xml
@@ -32,8 +32,8 @@
 <refmeta>
 <refentrytitle>SCONSIGN</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.3.6</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.3.6</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.4.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.4.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>sconsign</refname>
-- 
cgit v1.2.3