Konflikte behobendebian/3.1.2-1

1 files changed, 22 insertions, 22 deletions

diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch
index 63f1a47..dfbec85 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,12 @@ Index: trunk/scons.1
  \-D<dir>
  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:
+@@ -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