New upstream release, refresh patches

7 files changed, 28 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6c270cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.bzr
+.bzrignore
+.pc
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index ca830c5..52d12e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons (3.0.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Refresh patches.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Thu, 28 Sep 2017 10:22:56 +0200
+
 scons (2.5.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index fca11e7..878f29d 100644
--- a/debian/control
+++ b/debian/control
@@ -22,3 +22,4 @@ Description: replacement for make
  support.  SCons rule sets are Python scripts so as well as the features
  it provides itself SCons allows you to use the full power of Python
  to control compilation.
+
diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch
index d4be6bf..0fd1a6a 100644
--- a/debian/patches/0110-remove_stale_files.patch
+++ b/debian/patches/0110-remove_stale_files.patch
@@ -7,8 +7,8 @@ Index: trunk/engine/SCons/Script/Main.py
 ===================================================================
 --- trunk.orig/engine/SCons/Script/Main.py
 +++ trunk/engine/SCons/Script/Main.py
-@@ -1094,6 +1094,21 @@ def _main(parser):
-             print 'Found nothing to build'
+@@ -1106,6 +1106,21 @@ def _main(parser):
+             print('Found nothing to build')
              exit_status = 2
  
 +        # Remove temporary files left by SCons
diff --git a/debian/patches/0115-secure_script_scons.patch b/debian/patches/0115-secure_script_scons.patch
index 7463f32..24d9cf6 100644
--- a/debian/patches/0115-secure_script_scons.patch
+++ b/debian/patches/0115-secure_script_scons.patch
@@ -8,7 +8,7 @@ Index: trunk/script/scons
 ===================================================================
 --- trunk.orig/script/scons
 +++ trunk/script/scons
-@@ -75,8 +75,8 @@ if "SCONS_LIB_DIR" in os.environ:
+@@ -77,8 +77,8 @@ if "SCONS_LIB_DIR" in os.environ:
  
  # - running from source takes priority (since 2.3.2), excluding SCONS_LIB_DIR settings
  script_path = os.path.abspath(os.path.dirname(__file__))
diff --git a/debian/patches/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch
index ea82ca5..703ddaf 100644
--- a/debian/patches/0120-fix-bibtex-call.patch
+++ b/debian/patches/0120-fix-bibtex-call.patch
@@ -10,7 +10,7 @@ Index: trunk/engine/SCons/Tool/tex.py
 ===================================================================
 --- trunk.orig/engine/SCons/Tool/tex.py
 +++ trunk/engine/SCons/Tool/tex.py
-@@ -346,6 +346,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
+@@ -347,6 +347,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
                          if result != 0:
                              check_file_error_message(env['BIBTEX'], 'blg')
                          must_rerun_latex = True
@@ -24,7 +24,7 @@ Index: trunk/engine/SCons/Tool/tex.py
  
          # Now decide if biber will need to be run.
          # When the backend for biblatex is biber (by choice or default) the
-@@ -369,6 +376,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
+@@ -370,6 +377,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
                          if result != 0:
                              check_file_error_message(env['BIBER'], 'blg')
                          must_rerun_latex = True
diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch
index f66ea23..6543a2e 100644
--- a/debian/patches/0600-manpage-spelling.patch
+++ b/debian/patches/0600-manpage-spelling.patch
@@ -16,7 +16,7 @@ Index: trunk/scons.1
  .RE
  .PP
  \-\-config=force
-@@ -6350,7 +6350,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS
+@@ -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 +25,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 +34,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 +43,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 +52,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 +61,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 +70,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 +79,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 +88,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 +97,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 +106,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 +115,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