mergedebian/3.1.1-1

10 files changed, 138 insertions, 40 deletions

diff --git a/debian/changelog b/debian/changelog
index 98697c9..5a2658c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+scons (3.1.1-1) unstable; urgency=medium
+
+  [ Jörg Frings-Fürst ]
+  * New upstream release:
+    - Refresh patches.at
+    - Remove 0115-secure_script_scons.patch and
+      0105-java_ignore_nonexistent_files.patch.
+    - Use pybuild as buildsystem.
+  * Migrate to debhelper 12:
+    - Change debian/compat to 12.
+    - Bump minimum debhelper version in debian/control to >= 12.
+  * Declare compliance with Debian Policy 4.4.0 (No changes needed).
+  * debian/control:
+    - Remove trailing whitespaces.
+    - Add python3 (>= 3.5) support.
+    - Remove python2 support.
+    - Use secure URI for homepage.
+  * debian/rules:
+    - Remove trailing whitespaces.
+    - Add python3 support.
+    - Remove python2 support.
+  * debian/copyright:
+    - Add year 2019.
+    - Use secure URI.
+  * New debian/patches/0130-python3.patch:
+    - Switch shebang to python3.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 10 Aug 2019 09:05:16 +0200
+
 scons (3.0.1-2) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/compat b/debian/compat
index b4de394..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+12
diff --git a/debian/control b/debian/control
index 62c09be..8bcdffe 100644
--- a/debian/control
+++ b/debian/control
@@ -4,21 +4,22 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Uploaders: Laszlo Boszormenyi (GCS) <gcs@debian.org>
 Build-Depends:
- debhelper (>= 11),
+ debhelper (>= 12),
  dh-python,
- python (>= 2.7~)
-Standards-Version: 4.2.1.0
-Homepage: http://www.scons.org/
+ python3-all (>= 3.5)
+Standards-Version: 4.4.0
+Homepage: https://www.scons.org/
 Vcs-Git: https://salsa.debian.org/debian/scons.git
 Vcs-Browser: https://salsa.debian.org/debian/scons
 
 Package: scons
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends:
+ ${python3:Depends},
+ ${misc:Depends}
 Description: replacement for make
  SCons is a make replacement providing a range of enhanced features such
  as automated dependency generation and built in compilation cache
  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/copyright b/debian/copyright
index 677c09a..25d521d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: scons
 Upstream-Contact: Steven Knight <knight@baldmt.com>
-Source: http://www.scons.org
+Source: https://www.scons.org
 
 Files: *
-Copyright: 2001-2017 The SCons Foundation
+Copyright: 2001-2019 The SCons Foundation
            1999-2006 Gregory P. Ward
            2001-2003 Steven Knight
            2001-2004 Twisted Matrix Laboratories
@@ -17,13 +17,13 @@ Files: debian/*
 Copyright: 2002      Moshe Zadka <moshez@debian.org>
            2003-2008 Mark Brown <broonie@debian.org>
            2008-2014 Luca Falavigna <dktrkranz@ubuntu.com>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+           2014-2019 Jörg Frings-Fürst <debian@jff.email>
            2018      Laszlo Boszormenyi (GCS) <gcs@debian.org>
 License: GPL-3.0+
 
 Files: debian/patches/*
 Copyright: 2010-2014 Luca Falavigna <dktrkranz@ubuntu.com>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+           2014-2019 Jörg Frings-Fürst <debian@jff.email>
 License: Expat
 
 License: Expat
diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch
index 298d47c..9fbb186 100644
--- a/debian/patches/0110-remove_stale_files.patch
+++ b/debian/patches/0110-remove_stale_files.patch
@@ -7,7 +7,7 @@ Index: trunk/engine/SCons/Script/Main.py
 ===================================================================
 --- trunk.orig/engine/SCons/Script/Main.py
 +++ trunk/engine/SCons/Script/Main.py
-@@ -1106,6 +1106,21 @@ def _main(parser):
+@@ -1115,6 +1115,21 @@ def _main(parser):
              print('Found nothing to build')
              exit_status = 2
  
diff --git a/debian/patches/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch
index 0bdbee8..98b2db6 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
-@@ -347,6 +347,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
+@@ -351,6 +351,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
-@@ -370,6 +377,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
+@@ -375,6 +382,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio
                          if result != 0:
                              check_file_error_message(env['BIBER'], 'blg')
                          must_rerun_latex = True
diff --git a/debian/patches/0130-python3.patch b/debian/patches/0130-python3.patch
new file mode 100644
index 0000000..9c13592
--- /dev/null
+++ b/debian/patches/0130-python3.patch
@@ -0,0 +1,46 @@
+Description: Use shebang python3 
+Author: Jörg Fring-Fürst <debian@jff.email>
+Forwarded: not-needed
+Last-Update: 2019-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/script/scons
+===================================================================
+--- trunk.orig/script/scons
++++ trunk/script/scons
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python3
+ #
+ # SCons - a Software Constructor
+ #
+Index: trunk/script/scons-configure-cache
+===================================================================
+--- trunk.orig/script/scons-configure-cache
++++ trunk/script/scons-configure-cache
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python3
+ #
+ # SCons - a Software Constructor
+ #
+Index: trunk/script/scons-time
+===================================================================
+--- trunk.orig/script/scons-time
++++ trunk/script/scons-time
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # scons-time - run SCons timings and collect statistics
+ #
+Index: trunk/script/sconsign
+===================================================================
+--- trunk.orig/script/sconsign
++++ trunk/script/sconsign
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python3
+ #
+ # SCons - a Software Constructor
+ #
diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch
index 6d576ce..63f1a47 100644
--- a/debian/patches/0600-manpage-spelling.patch
+++ b/debian/patches/0600-manpage-spelling.patch
@@ -1,13 +1,13 @@
 Description: Correct manpage spelling errors
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2016-09-11
+Last-Update: 2019-07-23
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/scons.1
 ===================================================================
 --- trunk.orig/scons.1
 +++ trunk/scons.1
-@@ -443,7 +443,7 @@ call should use or generate the results
+@@ -447,7 +447,7 @@ call should use or generate the results
  .PP
  \-\-config=auto
  .RS 4
@@ -16,7 +16,7 @@ Index: trunk/scons.1
  .RE
  .PP
  \-\-config=force
-@@ -1545,7 +1545,7 @@ The tool definition (i\&.e\&. my_tool())
+@@ -1566,7 +1566,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
@@ -25,7 +25,7 @@ Index: trunk/scons.1
  .sp
  .if n \{\
  .RS 4
-@@ -6449,7 +6449,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,16 @@ 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)
  
-@@ -6681,7 +6681,7 @@ file\&. Note, that the updated
+@@ -6658,7 +6658,7 @@ files will be automatically created (i\&
+ \fB$LINGUAS_FILE\fR
+ and
+ \fB$POTDOMAIN\fR
+-are taken into acount too\&. All other construction variables used by
++are taken into account too\&. All other construction variables used by
+ \fBPOTUpdate\fR, and
+ \fBPOUpdate\fR
+ work here too\&.
+@@ -6741,7 +6741,7 @@ file\&. Note, that the updated
  POT
  and
  PO
@@ -43,7 +52,7 @@ Index: trunk/scons.1
  po/
  directory contains
  LINGUAS
-@@ -7221,7 +7221,7 @@ Example:
+@@ -7281,7 +7281,7 @@ Example:
  AllowSubstExceptions()
  
  # Also allow a string containing a zero\-division expansion
@@ -52,7 +61,7 @@ Index: trunk/scons.1
  AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
  .fi
  .if n \{\
-@@ -9196,7 +9196,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
@@ -61,7 +70,7 @@ Index: trunk/scons.1
  \fBReturn\fR\&. Any strings that contain white space
  .sp
  The optional
-@@ -10096,7 +10096,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
@@ -70,7 +79,7 @@ Index: trunk/scons.1
  .sp
  
  \fBVariantDir\fR
-@@ -11363,7 +11363,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
@@ -79,7 +88,7 @@ Index: trunk/scons.1
  fop
  or
  xep\&.
-@@ -11390,7 +11390,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
@@ -88,7 +97,7 @@ Index: trunk/scons.1
  xmllint\&.
  .RE
  .PP
-@@ -11421,7 +11421,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
@@ -97,7 +106,7 @@ Index: trunk/scons.1
  xsltproc
  (or
  saxon,
-@@ -11430,7 +11430,7 @@ xalan)\&.
+@@ -11582,7 +11582,7 @@ xalan)\&.
  .PP
  DOCBOOK_XSLTPROCPARAMS
  .RS 4
@@ -106,7 +115,7 @@ Index: trunk/scons.1
  saxon
  and
  saxon\-xslt, respectively\&.
-@@ -14081,7 +14081,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
@@ -115,7 +124,25 @@ Index: trunk/scons.1
  .RE
  .PP
  no_import_lib
-@@ -16414,7 +16414,7 @@ builder\&.
+@@ -16051,7 +16051,7 @@ The suffix used for tar file names\&.
+ TEMPFILEARGJOIN
+ .RS 4
+ The string (or character) to be used to join the arguments passed to TEMPFILE when command line exceeds the limit set by
+-\fB$MAXLINELENGTH\fR\&. The default value is a space\&. However for MSVC, MSLINK the default is a line seperator characters as defined by os\&.linesep\&. Note this value is used literally and not expanded by the subst logic\&.
++\fB$MAXLINELENGTH\fR\&. The default value is a space\&. However for MSVC, MSLINK the default is a line separator characters as defined by os\&.linesep\&. Note this value is used literally and not expanded by the subst logic\&.
+ .RE
+ .PP
+ TEMPFILEPREFIX
+@@ -16403,7 +16403,7 @@ file\&.
+ .PP
+ X_RPM_EXTRADEFS
+ .RS 4
+-A list used to supply extra defintions or flags to be added to the RPM
++A list used to supply extra definitions or flags to be added to the RPM
+ \&.spec
+ file\&. Each item is added as\-is with a carriage return appended\&. This is useful if some specific RPM feature not otherwise anticipated by SCons needs to be turned on or off\&. Note if this variable is omitted, SCons will by default supply the value
+ \*(Aq%global debug_package %{nil}\*(Aq
+@@ -16627,7 +16627,7 @@ builder\&.
  .PP
  _XGETTEXTFROMFLAGS
  .RS 4
@@ -124,7 +151,7 @@ Index: trunk/scons.1
  \-D<dir>
  flags from the
  \fB$XGETTEXTPATH\fR
-@@ -18354,7 +18354,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
diff --git a/debian/patches/series b/debian/patches/series
index d84f384..5325217 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
 0600-manpage-spelling.patch
-0115-secure_script_scons.patch
-0105-java_ignore_nonexistent_files.patch
+#0115-secure_script_scons.patch
+#0105-java_ignore_nonexistent_files.patch
 0110-remove_stale_files.patch
 0100-parallel_build.patch
 0120-fix-bibtex-call.patch
 #0125-printf_regression.patch
+0130-python3.patch
diff --git a/debian/rules b/debian/rules
index 60e93ec..e759c42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --with python2
-
-clean:
-	rm -fr build
-	dh $@
-
-override_dh_auto_install:
-	dh_auto_install -- --no-version-script --standalone-lib --no-install-man
+export PYBUILD_INSTALL_ARGS=--no-version-script --standalone-lib --no-install-man --no-install-bat
 
+%:
+	dh $@ --with python3 --buildsystem=pybuild