From c1083e1f5530a09b256975a3855ac2363d5ed6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jul 2019 18:16:07 +0200 Subject: Refresh / remove patches --- debian/changelog | 8 ++++++-- debian/patches/0110-remove_stale_files.patch | 2 +- debian/patches/0120-fix-bibtex-call.patch | 4 ++-- debian/patches/0600-manpage-spelling.patch | 28 ++++++++++++++-------------- debian/patches/series | 4 ++-- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 457f04c..a9456a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ -scons (3.0.1-2) UNRELEASED; urgency=medium +scons (3.0.5-1) UNRELEASED; urgency=medium + * New upstream release: + - Refresh patches.at + - Remove 0115-secure_script_scons.patch and + 0105-java_ignore_nonexistent_files.patch. * Refresh debian/patches/0110-remove_stale_files.patch for python 3 compatibility (Closes: #893740). Thanks to Bernd Zeimetz . @@ -15,7 +19,7 @@ scons (3.0.1-2) UNRELEASED; urgency=medium - Remove trailing whitespaces. - Add python3 support. - -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 + -- Jörg Frings-Fürst Fri, 12 Jul 2019 17:54:18 +0200 scons (3.0.1-1) unstable; urgency=medium 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/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 6d576ce..0942458 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 -@@ -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 +@@ -6484,7 +6484,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) -@@ -6681,7 +6681,7 @@ file\&. Note, that the updated +@@ -6716,7 +6716,7 @@ file\&. Note, that the updated POT and PO @@ -43,7 +43,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7221,7 +7221,7 @@ Example: +@@ -7256,7 +7256,7 @@ Example: AllowSubstExceptions() # Also allow a string containing a zero\-division expansion @@ -52,7 +52,7 @@ Index: trunk/scons.1 AllowSubstExceptions(IndexError, NameError, ZeroDivisionError) .fi .if n \{\ -@@ -9196,7 +9196,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9231,7 +9231,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 +61,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 +@@ -10139,7 +10139,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 +70,7 @@ Index: trunk/scons.1 .sp \fBVariantDir\fR -@@ -11363,7 +11363,7 @@ is used to create PDF output from an XML +@@ -11479,7 +11479,7 @@ is used to create PDF output from an XML .PP DOCBOOK_FOPFLAGS .RS 4 @@ -79,7 +79,7 @@ Index: trunk/scons.1 fop or xep\&. -@@ -11390,7 +11390,7 @@ is used to resolve XIncludes for a given +@@ -11506,7 +11506,7 @@ is used to resolve XIncludes for a given .PP DOCBOOK_XMLLINTFLAGS .RS 4 @@ -88,7 +88,7 @@ Index: trunk/scons.1 xmllint\&. .RE .PP -@@ -11421,7 +11421,7 @@ is used to transform an XML file via a g +@@ -11537,7 +11537,7 @@ is used to transform an XML file via a g .PP DOCBOOK_XSLTPROCFLAGS .RS 4 @@ -97,7 +97,7 @@ Index: trunk/scons.1 xsltproc (or saxon, -@@ -11430,7 +11430,7 @@ xalan)\&. +@@ -11546,7 +11546,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -106,7 +106,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14081,7 +14081,7 @@ A list of installed versions of the Metr +@@ -14216,7 +14216,7 @@ A list of installed versions of the Metr .PP NAME .RS 4 @@ -115,7 +115,7 @@ Index: trunk/scons.1 .RE .PP no_import_lib -@@ -16414,7 +16414,7 @@ builder\&. +@@ -16584,7 +16584,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -124,7 +124,7 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18354,7 +18354,7 @@ a = Action("build < ${SOURCE\&.file} > $ +@@ -18526,7 +18526,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..20ca14e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ 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 -- cgit v1.2.3