diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/files | 2 | ||||
| -rw-r--r-- | debian/patches/0125-printf_regression.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
5 files changed, 49 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8db961b..97812a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +scons (3.0.0-2) unstable; urgency=high + + * New patch/0125-printf_regression.patch (Closes: #878327): + - Support python 2 print statements in SConscripts + (cherry picked from upstream commit). + * Declare compliance with Debian Policy 4.1.1. (No changes needed). + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 13 Oct 2017 09:08:24 +0200 + scons (3.0.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index ce9b1b2..4d74f55 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-python, python (>= 2.7~) -Standards-Version: 4.1.0 +Standards-Version: 4.1.1 X-Python-Version: >= 2.7 Homepage: http://www.scons.org/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons.git diff --git a/debian/files b/debian/files index 55c5400..4cc8599 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -scons_3.0.0-1_source.buildinfo devel optional +scons_3.0.0-2_source.buildinfo devel optional diff --git a/debian/patches/0125-printf_regression.patch b/debian/patches/0125-printf_regression.patch new file mode 100644 index 0000000..1d5cee0 --- /dev/null +++ b/debian/patches/0125-printf_regression.patch @@ -0,0 +1,37 @@ +Description: Support python 2 print statements in SConscripts + This fixes a regression introduced in scons-3.0.0, where + SConscripts containing python 2 print statements would cause + syntax errors even when executing scons with python 2.7. +Origin: upstream, https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878327 +Forwarded: not-needed +Last-Update: 2017-10-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/CHANGES.txt +=================================================================== +--- trunk.orig/CHANGES.txt ++++ trunk/CHANGES.txt +@@ -11,6 +11,9 @@ NOTE: This is a major release. You shou + Significant changes in some python action signatures. Also switching between PY 2.7 and PY 3.5, 3.6 + will cause rebuilds. + ++ From Thomas Berg: ++ - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed ++ on the scope where SConstruct is executed, breaking existing builds using PY 2.7. + + From William Blevins: + - Updated D language scanner support to latest: 2.071.1. (PR #1924) +Index: trunk/engine/SCons/Script/SConscript.py +=================================================================== +--- trunk.orig/engine/SCons/Script/SConscript.py ++++ trunk/engine/SCons/Script/SConscript.py +@@ -5,8 +5,6 @@ files. + + """ + +-from __future__ import print_function +- + # + # Copyright (c) 2001 - 2017 The SCons Foundation + # diff --git a/debian/patches/series b/debian/patches/series index 3b82bac..f390c4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0110-remove_stale_files.patch 0100-parallel_build.patch 0120-fix-bibtex-call.patch +0125-printf_regression.patch |