Merge branch 'feature/upstream' into develop

1 files changed, 21 insertions, 12 deletions

diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch
index f66ea23..4afc829 100644
--- a/debian/patches/0600-manpage-spelling.patch
+++ b/debian/patches/0600-manpage-spelling.patch
@@ -16,7 +16,16 @@ Index: trunk/scons.1
  .RE
  .PP
  \-\-config=force
-@@ -6350,7 +6350,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS
+@@ -1472,7 +1472,7 @@ The tool definition (i\&.e\&. my_tool())
+ .PP
+ If no tool list is specified, then SCons will auto\-detect the installed tools using the PATH variable in the ENV construction variable and the platform name when the Environment is constructed\&. Changing the PATH variable after the Environment is constructed will not cause the tools to be redetected\&.
+ .PP
+-One feature now present within Scons is the ability to have nested tools\&. Tools which can be located within a subdirectory in the toolpath\&. With a nested tool name the dot represents a directory seperator
++One feature now present within Scons is the ability to have nested tools\&. Tools which can be located within a subdirectory in the toolpath\&. With a nested tool name the dot represents a directory separator
+ .sp
+ .if n \{\
+ .RS 4
+@@ -6376,7 +6376,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS
  good_foo = [(\*(Aq$foobar\*(Aq, \*(Aq$foobar\*(Aq), (\*(Aq$foo\*(Aq, \*(Aq$foo\*(Aq)]
  env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBST_DICT = good_foo)
  
@@ -25,7 +34,7 @@ Index: trunk/scons.1
  bad_bar = {\*(Aq@bar@\*(Aq: \*(Aq@soap@\*(Aq, \*(Aq@soap@\*(Aq: \*(Aqlye\*(Aq}
  env\&.Substfile(\*(Aqbar\&.in\*(Aq, SUBST_DICT = bad_bar)
  
-@@ -6582,7 +6582,7 @@ file\&. Note, that the updated
+@@ -6608,7 +6608,7 @@ file\&. Note, that the updated
  POT
  and
  PO
@@ -34,7 +43,7 @@ Index: trunk/scons.1
  po/
  directory contains
  LINGUAS
-@@ -7122,7 +7122,7 @@ Example:
+@@ -7148,7 +7148,7 @@ Example:
  AllowSubstExceptions()
  
  # Also allow a string containing a zero\-division expansion
@@ -43,7 +52,7 @@ Index: trunk/scons.1
  AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
  .fi
  .if n \{\
-@@ -9198,7 +9198,7 @@ Return([vars\&.\&.\&., stop=])
+@@ -9123,7 +9123,7 @@ Return([vars\&.\&.\&., stop=])
  .RS 4
  By default, this stops processing the current SConscript file and returns to the calling SConscript file the values of the variables named in the
  \fIvars\fR
@@ -52,7 +61,7 @@ Index: trunk/scons.1
  \fBReturn\fR\&. Any strings that contain white space
  .sp
  The optional
-@@ -10118,7 +10118,7 @@ function to create a copy of your source
+@@ -10023,7 +10023,7 @@ function to create a copy of your source
  \fIvariant_dir\fR
  is not found but exists under
  \fIsrc_dir\fR, the file or directory is copied to
@@ -61,7 +70,7 @@ Index: trunk/scons.1
  .sp
  
  \fBVariantDir\fR
-@@ -11373,7 +11373,7 @@ is used to create PDF output from an XML
+@@ -11290,7 +11290,7 @@ is used to create PDF output from an XML
  .PP
  DOCBOOK_FOPFLAGS
  .RS 4
@@ -70,7 +79,7 @@ Index: trunk/scons.1
  fop
  or
  xep\&.
-@@ -11400,7 +11400,7 @@ is used to resolve XIncludes for a given
+@@ -11317,7 +11317,7 @@ is used to resolve XIncludes for a given
  .PP
  DOCBOOK_XMLLINTFLAGS
  .RS 4
@@ -79,7 +88,7 @@ Index: trunk/scons.1
  xmllint\&.
  .RE
  .PP
-@@ -11431,7 +11431,7 @@ is used to transform an XML file via a g
+@@ -11348,7 +11348,7 @@ is used to transform an XML file via a g
  .PP
  DOCBOOK_XSLTPROCFLAGS
  .RS 4
@@ -88,7 +97,7 @@ Index: trunk/scons.1
  xsltproc
  (or
  saxon,
-@@ -11440,7 +11440,7 @@ xalan)\&.
+@@ -11357,7 +11357,7 @@ xalan)\&.
  .PP
  DOCBOOK_XSLTPROCPARAMS
  .RS 4
@@ -97,7 +106,7 @@ Index: trunk/scons.1
  saxon
  and
  saxon\-xslt, respectively\&.
-@@ -14052,7 +14052,7 @@ A list of installed versions of the Metr
+@@ -14008,7 +14008,7 @@ A list of installed versions of the Metr
  .PP
  NAME
  .RS 4
@@ -106,7 +115,7 @@ Index: trunk/scons.1
  .RE
  .PP
  no_import_lib
-@@ -16437,7 +16437,7 @@ builder\&.
+@@ -16341,7 +16341,7 @@ builder\&.
  .PP
  _XGETTEXTFROMFLAGS
  .RS 4
@@ -115,7 +124,7 @@ Index: trunk/scons.1
  \-D<dir>
  flags from the
  \fB$XGETTEXTPATH\fR
-@@ -18375,7 +18375,7 @@ a = Action("build < ${SOURCE\&.file} > $
+@@ -18279,7 +18279,7 @@ a = Action("build < ${SOURCE\&.file} > $
  The
  \fBAction\fR() global function also takes an
  \fBexitstatfunc\fR