From a6b3ffd0f78e4d74110de5894722daf97eb9404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 13 Oct 2017 08:43:21 +0200 Subject: New patch/0125-printf_regression.patch --- debian/changelog | 8 +++++++ debian/files | 1 - debian/patches/0125-printf_regression.patch | 37 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) delete mode 100644 debian/files create mode 100644 debian/patches/0125-printf_regression.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8db961b..6ba2445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +scons (3.0.0-2) UNRELEASED; urgency=medium + + * New patch/0125-printf_regression.patch (Closes: #878327): + - Support python 2 print statements in SConscripts + (cherry picked from upstream commit). + + -- Jörg Frings-Fürst Fri, 13 Oct 2017 08:22:58 +0200 + scons (3.0.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/files b/debian/files deleted file mode 100644 index 55c5400..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -scons_3.0.0-1_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 -- cgit v1.2.3 From aa818a90ad1dcf3db211d53a7ab9192ef682d159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 13 Oct 2017 09:04:59 +0200 Subject: Declare compliance with Debian Policy 4.1.1 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6ba2445..fd07eec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ scons (3.0.0-2) UNRELEASED; urgency=medium * 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 Fri, 13 Oct 2017 08:22:58 +0200 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 -- cgit v1.2.3 From f8b4d811de90457c2c826c01dcc86d8d985a19aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 13 Oct 2017 09:14:44 +0200 Subject: Change release, urgency and Date/time to release --- debian/changelog | 4 ++-- debian/files | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd07eec..97812a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -scons (3.0.0-2) UNRELEASED; urgency=medium +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 Fri, 13 Oct 2017 08:22:58 +0200 + -- Jörg Frings-Fürst Fri, 13 Oct 2017 09:08:24 +0200 scons (3.0.0-1) unstable; urgency=medium diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..4cc8599 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +scons_3.0.0-2_source.buildinfo devel optional -- cgit v1.2.3