From 38e1ebc9bcfdd09b7d498648ce8da900c232e89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 7 Oct 2019 19:30:02 +0200 Subject: switch back to release 3.1.1-1 --- debian/changelog | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5a2658c..4c50ebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +scons (3.1.1-4) UNRELEASED; urgency=medium + + * Switch to python3. + * Upload to experimental. + + -- Jörg Frings-Fürst Mon, 07 Oct 2019 19:20:36 +0200 + +scons (3.1.1-3) unstable; urgency=medium + + * Team Upload (salsa.d.o/debian collaborative namespace) + * Run dh-python with --python2 + - this makes the build reproducible (Closes: #934699) + - thanks and + + -- Gianfranco Costamagna Tue, 13 Aug 2019 20:19:04 +0200 + +scons (3.1.1-2) unstable; urgency=medium + + * Team Upload (salsa.d.o/debian collaborative namespace) + * Revert python3 switch, all scons reverse-dependencies should be fixed + before this change (Closes: #934595). + + -- Gianfranco Costamagna Mon, 12 Aug 2019 13:17:57 +0200 + scons (3.1.1-1) unstable; urgency=medium [ Jörg Frings-Fürst ] -- cgit v1.2.3 From d7a7880bf937df8230ecc836d375b741e776db31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 7 Oct 2019 19:31:58 +0200 Subject: Declare compliance with Debian Policy 4.4.1 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c50ebb..7d57b75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ scons (3.1.1-4) UNRELEASED; urgency=medium - * Switch to python3. + * Revert to release 3.1.1-1. * Upload to experimental. + * Declare compliance with Debian Policy 4.4.1 (No changes needed). -- Jörg Frings-Fürst Mon, 07 Oct 2019 19:20:36 +0200 diff --git a/debian/control b/debian/control index 8bcdffe..d49be29 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 12), dh-python, python3-all (>= 3.5) -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Homepage: https://www.scons.org/ Vcs-Git: https://salsa.debian.org/debian/scons.git Vcs-Browser: https://salsa.debian.org/debian/scons -- cgit v1.2.3 From 547dfc69ee70e6e36b736c8e03c6380a9bbe7a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 7 Oct 2019 19:37:27 +0200 Subject: d/control: Add Rules-Requires-Root: binary-targets --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7d57b75..0279181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ scons (3.1.1-4) UNRELEASED; urgency=medium * Revert to release 3.1.1-1. * Upload to experimental. * Declare compliance with Debian Policy 4.4.1 (No changes needed). + * debian/control: + - Add Rules-Requires-Root: binary-targets. -- Jörg Frings-Fürst Mon, 07 Oct 2019 19:20:36 +0200 diff --git a/debian/control b/debian/control index d49be29..d57483b 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: dh-python, python3-all (>= 3.5) Standards-Version: 4.4.1 +Rules-Requires-Root: binary-targets Homepage: https://www.scons.org/ Vcs-Git: https://salsa.debian.org/debian/scons.git Vcs-Browser: https://salsa.debian.org/debian/scons -- cgit v1.2.3 From 5dcfdef50f9721ffaa466bf23721b823141c1e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 7 Oct 2019 20:06:43 +0200 Subject: d/changelog: Change distribution to experimental, Change date and time --- 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 0279181..b4b3d5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (3.1.1-4) UNRELEASED; urgency=medium +scons (3.1.1-4) experimental; urgency=medium * Revert to release 3.1.1-1. * Upload to experimental. @@ -6,7 +6,7 @@ scons (3.1.1-4) UNRELEASED; urgency=medium * debian/control: - Add Rules-Requires-Root: binary-targets. - -- Jörg Frings-Fürst Mon, 07 Oct 2019 19:20:36 +0200 + -- Jörg Frings-Fürst Mon, 07 Oct 2019 19:41:05 +0200 scons (3.1.1-3) unstable; urgency=medium diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..1bcb86a --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +scons_3.1.1-4_source.buildinfo devel optional -- cgit v1.2.3 From 5fc18c7c06ca2c7089a832b4cf8928674eb1070b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 27 Dec 2019 09:34:38 +0100 Subject: New upstream release; refresh patches --- debian/changelog | 7 +++++ debian/files | 1 - debian/patches/0110-remove_stale_files.patch | 2 +- debian/patches/0600-manpage-spelling.patch | 41 +++++++++++----------------- 4 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b4b3d5b..8a9c22e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (3.1.2-1) UNRELEASED; urgency=medium + + * New upstream release. + - Refresh patches. + + -- Jörg Frings-Fürst Fri, 27 Dec 2019 09:24:55 +0100 + scons (3.1.1-4) experimental; urgency=medium * Revert to release 3.1.1-1. diff --git a/debian/files b/debian/files deleted file mode 100644 index 1bcb86a..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -scons_3.1.1-4_source.buildinfo devel optional diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index 9fbb186..98d063d 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 -@@ -1115,6 +1115,21 @@ def _main(parser): +@@ -1122,6 +1122,21 @@ def _main(parser): print('Found nothing to build') exit_status = 2 diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 63f1a47..c1517a6 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -7,7 +7,7 @@ Index: trunk/scons.1 =================================================================== --- trunk.orig/scons.1 +++ trunk/scons.1 -@@ -447,7 +447,7 @@ call should use or generate the results +@@ -457,7 +457,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 -@@ -1566,7 +1566,7 @@ The tool definition (i\&.e\&. my_tool()) +@@ -1572,7 +1572,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 -@@ -6509,7 +6509,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS +@@ -6544,7 +6544,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) -@@ -6658,7 +6658,7 @@ files will be automatically created (i\& +@@ -6693,7 +6693,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\&. -@@ -6741,7 +6741,7 @@ file\&. Note, that the updated +@@ -6776,7 +6776,7 @@ file\&. Note, that the updated POT and PO @@ -52,7 +52,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7281,7 +7281,7 @@ Example: +@@ -7348,7 +7348,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 \{\ -@@ -9267,7 +9267,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9342,7 +9342,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 -@@ -10175,7 +10175,7 @@ function to create a copy of your source +@@ -10117,7 +10117,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 -@@ -11515,7 +11515,7 @@ is used to create PDF output from an XML +@@ -11411,7 +11411,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\&. -@@ -11542,7 +11542,7 @@ is used to resolve XIncludes for a given +@@ -11438,7 +11438,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 -@@ -11573,7 +11573,7 @@ is used to transform an XML file via a g +@@ -11469,7 +11469,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, -@@ -11582,7 +11582,7 @@ xalan)\&. +@@ -11478,7 +11478,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -115,7 +115,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14253,7 +14253,7 @@ A list of installed versions of the Metr +@@ -14142,7 +14142,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 -@@ -16051,7 +16051,7 @@ The suffix used for tar file names\&. +@@ -15924,7 +15924,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 @@ -133,7 +133,7 @@ Index: trunk/scons.1 .RE .PP TEMPFILEPREFIX -@@ -16403,7 +16403,7 @@ file\&. +@@ -16276,7 +16276,7 @@ file\&. .PP X_RPM_EXTRADEFS .RS 4 @@ -142,7 +142,7 @@ Index: trunk/scons.1 \&.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\&. +@@ -16500,7 +16500,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -151,12 +151,3 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18569,7 +18569,7 @@ a = Action("build < ${SOURCE\&.file} > $ - The - \fBAction\fR() global function also takes an - \fBexitstatfunc\fR --keyword argument which specifies a function that is passed the exit status (or return value) from the specified action and can return an arbitrary or modified value\&. This can be used, for example, to specify that an Action object\*(Aqs return value should be ignored under special conditions and SCons should, therefore, consider that the action always suceeds: -+keyword argument which specifies a function that is passed the exit status (or return value) from the specified action and can return an arbitrary or modified value\&. This can be used, for example, to specify that an Action object\*(Aqs return value should be ignored under special conditions and SCons should, therefore, consider that the action always succeeds: - .sp - .if n \{\ - .RS 4 -- cgit v1.2.3 From 4ef66103cd6d976d479326d874ae0fcd6da2c3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 27 Dec 2019 09:36:52 +0100 Subject: Switch to debhelper-compat --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8a9c22e..1b161f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ scons (3.1.2-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patches. + * Switch to debhelper-compat: + - debian/control: Replace debhelper with debhelper-compat. + - Remove debian/compat. -- Jörg Frings-Fürst Fri, 27 Dec 2019 09:24:55 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index d57483b..dd1e9dc 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: - debhelper (>= 12), + debhelper-compat (= 12), dh-python, python3-all (>= 3.5) Standards-Version: 4.4.1 -- cgit v1.2.3 From 84ce23d5addc6eb05de99063e40510316c11368c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 27 Dec 2019 09:38:12 +0100 Subject: Declare compliance with Debian Policy 4.4.1.2 --- 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 1b161f5..a58ac40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ scons (3.1.2-1) UNRELEASED; urgency=medium * Switch to debhelper-compat: - debian/control: Replace debhelper with debhelper-compat. - Remove debian/compat. + * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). -- Jörg Frings-Fürst Fri, 27 Dec 2019 09:24:55 +0100 diff --git a/debian/control b/debian/control index dd1e9dc..4fbcd41 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 12), dh-python, python3-all (>= 3.5) -Standards-Version: 4.4.1 +Standards-Version: 4.4.1.2 Rules-Requires-Root: binary-targets Homepage: https://www.scons.org/ Vcs-Git: https://salsa.debian.org/debian/scons.git -- cgit v1.2.3 From eef30d040504deb5188f9080ad2e4e16b53df349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 27 Dec 2019 09:53:19 +0100 Subject: Switch to Rules-Requires-Root: no --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a58ac40..6f51ba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ scons (3.1.2-1) UNRELEASED; urgency=medium - debian/control: Replace debhelper with debhelper-compat. - Remove debian/compat. * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). + * debian/control: + - Switch to Rules-Requires-Root: no. -- Jörg Frings-Fürst Fri, 27 Dec 2019 09:24:55 +0100 diff --git a/debian/control b/debian/control index 4fbcd41..a1862f0 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-python, python3-all (>= 3.5) Standards-Version: 4.4.1.2 -Rules-Requires-Root: binary-targets +Rules-Requires-Root: no Homepage: https://www.scons.org/ Vcs-Git: https://salsa.debian.org/debian/scons.git Vcs-Browser: https://salsa.debian.org/debian/scons -- cgit v1.2.3 From 7adee3792b49c90ac4cb47114abee86c2b3c3590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 27 Dec 2019 09:59:58 +0100 Subject: add new spelling error to d/p/0600-manpage-spelling.patch --- debian/patches/0600-manpage-spelling.patch | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index c1517a6..dfbec85 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -151,3 +151,12 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR +@@ -18442,7 +18442,7 @@ a = Action("build < ${SOURCE\&.file} > $ + .PP + + \fIexitstatfunc\fR +-specifies a function that is passed the exit status (or return value) from the specified action and can return an arbitrary or modified value\&. This can be used, for example, to specify that an Action object\*(Aqs return value should be ignored under special conditions and SCons should, therefore, consider that the action always suceeds: ++specifies a function that is passed the exit status (or return value) from the specified action and can return an arbitrary or modified value\&. This can be used, for example, to specify that an Action object\*(Aqs return value should be ignored under special conditions and SCons should, therefore, consider that the action always succeeds: + .sp + .if n \{\ + .RS 4 -- cgit v1.2.3 From 5d14e9e6b9aa6c884d8a4787cd248c9ab3612962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 27 Dec 2019 10:05:48 +0100 Subject: d/changelog: Change distribution to experimental, Change date and time --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6f51ba0..65d0dc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (3.1.2-1) UNRELEASED; urgency=medium +scons (3.1.2-1) experimental; urgency=medium * New upstream release. - Refresh patches. @@ -8,8 +8,9 @@ scons (3.1.2-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). * debian/control: - Switch to Rules-Requires-Root: no. + * Upload to experimental. - -- Jörg Frings-Fürst Fri, 27 Dec 2019 09:24:55 +0100 + -- Jörg Frings-Fürst Fri, 27 Dec 2019 10:03:54 +0100 scons (3.1.1-4) experimental; urgency=medium -- cgit v1.2.3