New upstream release 3.1.0

2 files changed, 14 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 4f67f4b..aecd027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-scons (3.0.5-1) unstable; urgency=medium
+scons (3.1.0-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
   * New upstream release:
diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch
index 1b7e99d..f0389ba 100644
--- a/debian/patches/0600-manpage-spelling.patch
+++ b/debian/patches/0600-manpage-spelling.patch
@@ -25,7 +25,7 @@ Index: trunk/scons.1
  .sp
  .if n \{\
  .RS 4
-@@ -6484,7 +6484,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS
+@@ -6509,7 +6509,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)
  
@@ -34,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)
  
-@@ -6633,7 +6633,7 @@ files will be automatically created (i\&
+@@ -6658,7 +6658,7 @@ files will be automatically created (i\&
  \fB$LINGUAS_FILE\fR
  and
  \fB$POTDOMAIN\fR
@@ -43,7 +43,7 @@ Index: trunk/scons.1
  \fBPOTUpdate\fR, and
  \fBPOUpdate\fR
  work here too\&.
-@@ -6716,7 +6716,7 @@ file\&. Note, that the updated
+@@ -6741,7 +6741,7 @@ file\&. Note, that the updated
  POT
  and
  PO
@@ -52,7 +52,7 @@ Index: trunk/scons.1
  po/
  directory contains
  LINGUAS
-@@ -7256,7 +7256,7 @@ Example:
+@@ -7281,7 +7281,7 @@ Example:
  AllowSubstExceptions()
  
  # Also allow a string containing a zero\-division expansion
@@ -61,7 +61,7 @@ Index: trunk/scons.1
  AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
  .fi
  .if n \{\
-@@ -9231,7 +9231,7 @@ Return([vars\&.\&.\&., stop=])
+@@ -9267,7 +9267,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
@@ -70,7 +70,7 @@ Index: trunk/scons.1
  \fBReturn\fR\&. Any strings that contain white space
  .sp
  The optional
-@@ -10139,7 +10139,7 @@ function to create a copy of your source
+@@ -10175,7 +10175,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
@@ -79,7 +79,7 @@ Index: trunk/scons.1
  .sp
  
  \fBVariantDir\fR
-@@ -11479,7 +11479,7 @@ is used to create PDF output from an XML
+@@ -11515,7 +11515,7 @@ is used to create PDF output from an XML
  .PP
  DOCBOOK_FOPFLAGS
  .RS 4
@@ -88,7 +88,7 @@ Index: trunk/scons.1
  fop
  or
  xep\&.
-@@ -11506,7 +11506,7 @@ is used to resolve XIncludes for a given
+@@ -11542,7 +11542,7 @@ is used to resolve XIncludes for a given
  .PP
  DOCBOOK_XMLLINTFLAGS
  .RS 4
@@ -97,7 +97,7 @@ Index: trunk/scons.1
  xmllint\&.
  .RE
  .PP
-@@ -11537,7 +11537,7 @@ is used to transform an XML file via a g
+@@ -11573,7 +11573,7 @@ is used to transform an XML file via a g
  .PP
  DOCBOOK_XSLTPROCFLAGS
  .RS 4
@@ -106,7 +106,7 @@ Index: trunk/scons.1
  xsltproc
  (or
  saxon,
-@@ -11546,7 +11546,7 @@ xalan)\&.
+@@ -11582,7 +11582,7 @@ xalan)\&.
  .PP
  DOCBOOK_XSLTPROCPARAMS
  .RS 4
@@ -115,7 +115,7 @@ Index: trunk/scons.1
  saxon
  and
  saxon\-xslt, respectively\&.
-@@ -14216,7 +14216,7 @@ A list of installed versions of the Metr
+@@ -14253,7 +14253,7 @@ A list of installed versions of the Metr
  .PP
  NAME
  .RS 4
@@ -124,7 +124,7 @@ Index: trunk/scons.1
  .RE
  .PP
  no_import_lib
-@@ -16584,7 +16584,7 @@ builder\&.
+@@ -16627,7 +16627,7 @@ builder\&.
  .PP
  _XGETTEXTFROMFLAGS
  .RS 4
@@ -133,7 +133,7 @@ Index: trunk/scons.1
  \-D<dir>
  flags from the
  \fB$XGETTEXTPATH\fR
-@@ -18526,7 +18526,7 @@ a = Action("build < ${SOURCE\&.file} > $
+@@ -18569,7 +18569,7 @@ a = Action("build < ${SOURCE\&.file} > $
  The
  \fBAction\fR() global function also takes an
  \fBexitstatfunc\fR