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/patches/0600-manpage-spelling.patch | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'debian/patches/0600-manpage-spelling.patch') 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 -- cgit v1.2.3 From a340885007a394d44fd8f04c36d7536062b871ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:38:36 +0200 Subject: Refresh patches --- debian/patches/0600-manpage-spelling.patch | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian/patches/0600-manpage-spelling.patch') diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 0942458..1b7e99d 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -34,6 +34,15 @@ 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) +@@ -6633,7 +6633,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\&. @@ -6716,7 +6716,7 @@ file\&. Note, that the updated POT and -- cgit v1.2.3 From 10171dd6571470b5cb1986d2a18a9737b37e4fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 23 Jul 2019 13:35:49 +0200 Subject: New upstream release 3.1.0 --- debian/patches/0600-manpage-spelling.patch | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'debian/patches/0600-manpage-spelling.patch') diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 1b7e99d..f0389ba 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -25,7 +25,7 @@ Index: trunk/scons.1 .sp .if n \{\ .RS 4 -@@ -6484,7 +6484,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,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) -@@ -6633,7 +6633,7 @@ files will be automatically created (i\& +@@ -6658,7 +6658,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\&. -@@ -6716,7 +6716,7 @@ file\&. Note, that the updated +@@ -6741,7 +6741,7 @@ file\&. Note, that the updated POT and PO @@ -52,7 +52,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7256,7 +7256,7 @@ Example: +@@ -7281,7 +7281,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 \{\ -@@ -9231,7 +9231,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 @@ -70,7 +70,7 @@ Index: trunk/scons.1 \fBReturn\fR\&. Any strings that contain white space .sp The optional -@@ -10139,7 +10139,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 @@ -79,7 +79,7 @@ Index: trunk/scons.1 .sp \fBVariantDir\fR -@@ -11479,7 +11479,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 @@ -88,7 +88,7 @@ Index: trunk/scons.1 fop or xep\&. -@@ -11506,7 +11506,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 @@ -97,7 +97,7 @@ Index: trunk/scons.1 xmllint\&. .RE .PP -@@ -11537,7 +11537,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 @@ -106,7 +106,7 @@ Index: trunk/scons.1 xsltproc (or saxon, -@@ -11546,7 +11546,7 @@ xalan)\&. +@@ -11582,7 +11582,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -115,7 +115,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14216,7 +14216,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 @@ -124,7 +124,7 @@ Index: trunk/scons.1 .RE .PP no_import_lib -@@ -16584,7 +16584,7 @@ builder\&. +@@ -16627,7 +16627,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -133,7 +133,7 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18526,7 +18526,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 -- cgit v1.2.3 From 43cacb94bedb48f949db55500b9d131baf971696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 23 Jul 2019 16:36:49 +0200 Subject: d/changelog: change date and time; refresh d/patches/0600-manpage-spelling.patch --- debian/patches/0600-manpage-spelling.patch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'debian/patches/0600-manpage-spelling.patch') diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index f0389ba..63f1a47 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -1,6 +1,6 @@ Description: Correct manpage spelling errors Author: Jörg Frings-Fürst -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 @@ -124,6 +124,24 @@ Index: trunk/scons.1 .RE .PP no_import_lib +@@ -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 -- cgit v1.2.3