[Monotone-commits-diffs] org.debian.monotone: 77b4ea6812650f8c38a0f43a57b804d4a3dd80ea

[code]

revision:            77b4ea6812650f8c38a0f43a57b804d4a3dd80ea
date:                2013-07-16T21:18:48
author:              address@hidden
branch:              org.debian.monotone
changelog:
changelog: add 1.0-9
patches/08-texinfo-fix.diff: add fixes for texinfo
patches/series: enable above patch

manifest:
format_version "1"

new_manifest [68ea7f9ca3f0fd8836c8bfeb24403ebe44733e58]

old_revision [2fc841f3f4d902aeb4329ac45ba3c20f9bc363bc]

add_file "patches/08-texinfo-fix.diff"
 content [39c3395646a7bd03f737ee531fee540b49223aaa]

patch "changelog"
 from [1af2c13635fd458e36349b681201e4ed776cc54c]
   to [b338366c3c66962bc5e02cd14d79dbae4880e500]

patch "patches/series"
 from [dfcefe50bc0a318947c49406a12e52f7b2d649a9]
   to [17ff0966a419e398ba21252c4236f9fd684d6e1e]
============================================================
--- changelog	1af2c13635fd458e36349b681201e4ed776cc54c
+++ changelog	b338366c3c66962bc5e02cd14d79dbae4880e500
@@ -1,3 +1,9 @@
+monotone (1.0-9) unstable; urgency=low
+
+  * Add patches/08-texinfo-fix.diff. Closes: #712340.
+
+ -- Markus Wanner <address@hidden>  Tue, 16 Jul 2013 22:28:42 +0200
+
 monotone (1.0-8) unstable; urgency=low
 
   * Upload to unstable.
============================================================
--- /dev/null	
+++ patches/08-texinfo-fix.diff	39c3395646a7bd03f737ee531fee540b49223aaa
@@ -0,0 +1,623 @@
+Description: fix texinfo errors with texinfo >= 5.0
+Origin: upstream, commit: 0d22697daf2fd169db15445cd88f8a7be7371f64
+Author: Markus Wanner <address@hidden>
+--- a/doc/monotone.texi
++++ b/doc/monotone.texi
+@@ -4779,7 +4779,7 @@
+ Cancel all previous @option{--rcfile} options (standard rcfiles are
+ still loaded). See @ref{rcfiles}.
+ 
address@hidden --root <arg>
address@hidden --root <arg>
+ Limit the search for a workspace to the specified root directory
+ 
+ @item --ssh-sign <arg>
+@@ -6150,7 +6150,7 @@
+ Specifying only the pathname "." will restrict the search for unknown
+ files to the current subdirectory of the workspace.
+ 
address@hidden mtn list vars address@hidden
address@hidden mtn list vars address@hidden
+ @itemx mtn ls vars
+ @command{ls vars} is an alias for @command{list vars}.
+ 
+--- a/doc/pcrepattern.texi
++++ b/doc/pcrepattern.texi
+@@ -74,32 +74,32 @@
+ brackets, the metacharacters are as follows:
+ 
+ @table @code
address@hidden \
address@hidden \
+ general escape character with several uses
address@hidden ^
address@hidden ^
+ assert start of string (or line, in multiline mode)
address@hidden $
address@hidden $
+ assert end of string (or line, in multiline mode)
address@hidden .
address@hidden .
+ match any character except newline (by default)
address@hidden [
address@hidden [
+ start character class definition
address@hidden |
address@hidden |
+ start of alternative branch
address@hidden (
address@hidden (
+ start subpattern
address@hidden )
address@hidden )
+ end subpattern
address@hidden ?
address@hidden ?
+ extends the meaning of @samp{(}
+          also 0 or 1 quantifier
+          also quantifier minimizer
address@hidden *
address@hidden *
+ 0 or more quantifier
address@hidden +
address@hidden +
+ 1 or more quantifier
+          also ``possessive quantifier''
address@hidden @{
address@hidden @{
+ start min/max quantifier
+ @end table
+ 
+@@ -108,16 +108,16 @@
+ class". In a character class the only metacharacters are:
+ 
+ @table @code
address@hidden \
address@hidden \
+ general escape character
address@hidden ^
address@hidden ^
+ negate the class, but only if the first character
address@hidden -
address@hidden -
+ indicates character range
address@hidden [
address@hidden [
+ POSIX character class (only if followed by POSIX
+            syntax)
address@hidden ]
address@hidden ]
+ terminates the character class
+ @end table
+ 
+@@ -159,25 +159,25 @@
+ represents:
+ 
+ @table @code
address@hidden \a
address@hidden \a
+ alarm, that is, the BEL character (hex 07)
address@hidden address@hidden
address@hidden address@hidden
+ "address@hidden", where @var{x} is any character
address@hidden \e
address@hidden \e
+ escape (hex 1B)
address@hidden \f
address@hidden \f
+ formfeed (hex 0C)
address@hidden \n
address@hidden \n
+ linefeed (hex 0A)
address@hidden \r
address@hidden \r
+ carriage return (hex 0D)
address@hidden \t
address@hidden \t
+ tab (hex 09)
address@hidden address@hidden
address@hidden address@hidden
+ character with octal code @var{ddd}, or backreference
address@hidden address@hidden
address@hidden address@hidden
+ character with hex code @var{hh}
address@hidden address@hidden@address@hidden
address@hidden address@hidden@address@hidden
+ character with hex code @var{hhh...}
+ @end table
+ 
+@@ -244,27 +244,27 @@
+ @samp{\777} are permitted. For example:
+ 
+ @table @code
address@hidden \040
address@hidden \040
+ is another way of writing a space
address@hidden \40
address@hidden \40
+ is the same, provided there are fewer than 40
+             previous capturing subpatterns
address@hidden \7
address@hidden \7
+ is always a back reference
address@hidden \11
address@hidden \11
+ might be a back reference, or another way of
+             writing a tab
address@hidden \011
address@hidden \011
+ is always a tab
address@hidden \0113
address@hidden \0113
+ is a tab followed by the character @samp{3}
address@hidden \113
address@hidden \113
+ might be a back reference, otherwise the
+             character with octal code 113
address@hidden \377
address@hidden \377
+ might be a back reference, otherwise
+             the byte consisting entirely of 1 bits
address@hidden \81
address@hidden \81
+ is either a back reference, or a binary zero
+             followed by the two characters @samp{8} and @samp{1}
+ @end table
+@@ -294,25 +294,25 @@
+ following are always recognized:
+ 
+ @table @code
address@hidden \d
address@hidden \d
+ any decimal digit
address@hidden \D
address@hidden \D
+ any character that is not a decimal digit
address@hidden \h
address@hidden \h
+ any horizontal whitespace character
address@hidden \H
address@hidden \H
+ any character that is not a horizontal whitespace character
address@hidden \s
address@hidden \s
+ any whitespace character
address@hidden \S
address@hidden \S
+ any character that is not a whitespace character
address@hidden \v
address@hidden \v
+ any vertical whitespace character
address@hidden \V
address@hidden \V
+ any character that is not a vertical whitespace character
address@hidden \w
address@hidden \w
+ any ``word'' character
address@hidden \W
address@hidden \W
+ any ``non-word'' character
+ @end table
+ 
+@@ -342,43 +342,43 @@
+ characters are:
+ 
+ @table @code
address@hidden U+0009
address@hidden U+0009
+ Horizontal tab
address@hidden U+0020
address@hidden U+0020
+ Space
address@hidden U+00A0
address@hidden U+00A0
+ Non-break space
address@hidden U+1680
address@hidden U+1680
+ Ogham space mark
address@hidden U+180E
address@hidden U+180E
+ Mongolian vowel separator
+ @item U+2000
+ En quad
address@hidden U+2001
address@hidden U+2001
+ Em quad
address@hidden U+2002
address@hidden U+2002
+ En space
address@hidden U+2003
address@hidden U+2003
+ Em space
address@hidden U+2004
address@hidden U+2004
+ Three-per-em space
address@hidden U+2005
address@hidden U+2005
+ Four-per-em space
address@hidden U+2006
address@hidden U+2006
+ Six-per-em space
+ @item U+2007
+ Figure space
address@hidden U+2008
address@hidden U+2008
+ Punctuation space
address@hidden U+2009
address@hidden U+2009
+ Thin space
address@hidden U+200A
address@hidden U+200A
+ Hair space
address@hidden U+202F
address@hidden U+202F
+ Narrow no-break space
address@hidden U+205F
address@hidden U+205F
+ Medium mathematical space
address@hidden U+3000
address@hidden U+3000
+ Ideographic space
+ @end table
+ 
+@@ -386,19 +386,19 @@
+ The vertical space characters are:
+ 
+ @table @code
address@hidden U+000A
address@hidden U+000A
+ Linefeed
address@hidden U+000B
address@hidden U+000B
+ Vertical tab
address@hidden U+000C
address@hidden U+000C
+ Formfeed
address@hidden U+000D
address@hidden U+000D
+ Carriage return
address@hidden U+0085
address@hidden U+0085
+ Next line
address@hidden U+2028
address@hidden U+2028
+ Line separator
address@hidden U+2029
address@hidden U+2029
+ Paragraph separator
+ @end table
+ 
+@@ -418,15 +418,15 @@
+ the following five sequences:
+ 
+ @table @code
address@hidden (*CR)
address@hidden (*CR)
+   carriage return
address@hidden (*LF)
address@hidden (*LF)
+   linefeed
address@hidden (*CRLF)
address@hidden (*CRLF)
+   carriage return, followed by linefeed
address@hidden (*ANYCRLF)
address@hidden (*ANYCRLF)
+   any of the three above
address@hidden (*ANY)
address@hidden (*ANY)
+   all Unicode newline sequences
+ @end table
+ 
+@@ -474,9 +474,9 @@
+ pattern string with one of the following sequences:
+ 
+ @table @code
address@hidden (*BSR_ANYCRLF)
address@hidden (*BSR_ANYCRLF)
+ @key{CR}, @key{LF}, or @address@hidden only
address@hidden (*BSR_UNICODE)
address@hidden (*BSR_UNICODE)
+ any Unicode newline sequence (the default)
+ @end table
+ 
+@@ -501,11 +501,11 @@
+ 256, but they do work in this mode.  The extra escape sequences are:
+ 
+ @table @code
address@hidden address@hidden@address@hidden
address@hidden address@hidden@address@hidden
+ a character with the @var{xx} property
address@hidden address@hidden@address@hidden
address@hidden address@hidden@address@hidden
+ a character without the @var{xx} property
address@hidden \X
address@hidden \X
+ an extended Unicode sequence
+ @end table
+ 
+@@ -618,83 +618,83 @@
+ @table @code
+ @item C
+ Other
address@hidden Cc
address@hidden Cc
+ Control
address@hidden Cf
address@hidden Cf
+ Format
address@hidden Cn
address@hidden Cn
+ Unassigned
address@hidden Co
address@hidden Co
+ Private use
address@hidden Cs
address@hidden Cs
+ Surrogate
+ 
+ @item L
+ Letter
address@hidden Ll
address@hidden Ll
+ Lower case letter
address@hidden Lm
address@hidden Lm
+ Modifier letter
address@hidden Lo
address@hidden Lo
+ Other letter
address@hidden Lt
address@hidden Lt
+ Title case letter
address@hidden Lu
address@hidden Lu
+ Upper case letter
+ 
+ @item M
+ Mark
address@hidden Mc
address@hidden Mc
+ Spacing mark
address@hidden Me
address@hidden Me
+ Enclosing mark
address@hidden Mn
address@hidden Mn
+ Non-spacing mark
+ 
+ @item N
+ Number
address@hidden Nd
address@hidden Nd
+ Decimal number
address@hidden Nl
address@hidden Nl
+ Letter number
address@hidden No
address@hidden No
+ Other number
+ 
+ @item P
+ Punctuation
address@hidden Pc
address@hidden Pc
+ Connector punctuation
address@hidden Pd
address@hidden Pd
+ Dash punctuation
address@hidden Pe
address@hidden Pe
+ Close punctuation
address@hidden Pf
address@hidden Pf
+ Final punctuation
address@hidden Pi
address@hidden Pi
+ Initial punctuation
address@hidden Po
address@hidden Po
+ Other punctuation
address@hidden Ps
address@hidden Ps
+ Open punctuation
+ 
+ @item S
+ Symbol
address@hidden Sc
address@hidden Sc
+ Currency symbol
address@hidden Sk
address@hidden Sk
+ Modifier symbol
address@hidden Sm
address@hidden Sm
+ Mathematical symbol
address@hidden So
address@hidden So
+ Other symbol
+ 
+ @item Z
+ Separator
address@hidden Zl
address@hidden Zl
+ Line separator
address@hidden Zp
address@hidden Zp
+ Paragraph separator
address@hidden Zs
address@hidden Zs
+ Space separator
+ @end table
+ 
+@@ -771,18 +771,18 @@
+ described below.  The backslashed assertions are:
+ 
+ @table @code
address@hidden \b
address@hidden \b
+ matches at a word boundary
address@hidden \B
address@hidden \B
+ matches when not at a word boundary
address@hidden \A
address@hidden \A
+ matches at the start of the subject
address@hidden \Z
address@hidden \Z
+ matches at the end of the subject
+           also matches before a newline at the end of the subject
address@hidden \z
address@hidden \z
+ matches only at the end of the subject
address@hidden \G
address@hidden \G
+ matches at the first matching position in the subject
+ @end table
+ 
+@@ -993,33 +993,33 @@
+ supported class names are
+ 
+ @table @code
address@hidden alnum
address@hidden alnum
+ letters and digits
address@hidden alpha
address@hidden alpha
+ letters
address@hidden ascii
address@hidden ascii
+ character codes 0 -- 127
address@hidden blank
address@hidden blank
+ space or tab only
address@hidden cntrl
address@hidden cntrl
+ control characters
address@hidden digit
address@hidden digit
+ decimal digits (same as @samp{\d})
address@hidden graph
address@hidden graph
+ printing characters, excluding space
address@hidden lower
address@hidden lower
+ lower case letters
address@hidden print
address@hidden print
+ printing characters, including space
address@hidden punct
address@hidden punct
+ printing characters, excluding letters and digits
address@hidden space
address@hidden space
+ white space (not quite the same as @samp{\s})
address@hidden upper
address@hidden upper
+ upper case letters
address@hidden word
address@hidden word
+ ``word'' characters (same as @samp{\w})
address@hidden xdigit
address@hidden xdigit
+ hexadecimal digits
+ @end table
+ 
+@@ -1071,22 +1071,22 @@
+ @samp{)}.  The option letters are
+ 
+ @table @code
address@hidden i
address@hidden i
+ Caseless: characters in one case match the corresponding
+      characters in other cases as well.
address@hidden m
address@hidden m
+ Multiline: @samp{^} and @samp{$} match at newlines
+      as well as at beginning and end of string.
address@hidden s
address@hidden s
+ Dotall: dot matches any character, including newline characters.
address@hidden x
address@hidden x
+ Extended syntax: unescaped white space is ignored and embedded
+      comments are possible.
address@hidden J
address@hidden J
+ Dupnames: names for capturing subpattern need not be unique.
address@hidden U
address@hidden U
+ Ungreedy: quantifiers match as few times as possible by default.
address@hidden X
address@hidden X
+ Extra: for forward compatibility, give an error if any escape sequence
+ with no defined meaning appears.
+ @end table
+@@ -1358,11 +1358,11 @@
+ single-character abbreviations:
+ 
+ @table @code
address@hidden *
address@hidden *
+ is equivalent to @{0,@}
address@hidden +
address@hidden +
+ is equivalent to @{1,@}
address@hidden ?
address@hidden ?
+ is equivalent to @{0,address@hidden
+ @end table
+ 
+@@ -2302,7 +2302,7 @@
+ The following verbs act as soon as they are encountered:
+ 
+ @table @code
address@hidden (*ACCEPT)
address@hidden (*ACCEPT)
+ 
+ This verb causes the match to end successfully, skipping the remainder
+ of the pattern. When inside a recursion, only the innermost pattern is
+@@ -2317,7 +2317,7 @@
+ This matches @samp{AB}, @samp{AAD}, or @samp{ACD}, but when it matches
+ @samp{AB}, no data is captured.
+ 
address@hidden (*FAIL) @r{or} (*F)
address@hidden (*FAIL) @r{or} (*F)
+ 
+ This verb causes the match to fail, forcing backtracking to occur. It
+ is equivalent to @samp{(?!)} but easier to read.  It is not clear
+@@ -2334,7 +2334,7 @@
+ occurs.
+ 
+ @table @code
address@hidden (*COMMIT)
address@hidden (*COMMIT)
+ 
+ This verb causes the whole match to fail outright if the rest of the
+ pattern does not match. Even if the pattern is unanchored, no further
+@@ -2350,7 +2350,7 @@
+ This matches @samp{xxaab} but not @samp{aacaab}. It can be thought of
+ as a kind of dynamic anchor, or ``I've started, so I must finish.''
+ 
address@hidden (*PRUNE)
address@hidden (*PRUNE)
+ 
+ This verb causes the match to fail at the current position if the rest
+ of the pattern does not match. If the pattern is unanchored, the
+@@ -2363,7 +2363,7 @@
+ are some uses of @code{(*PRUNE)} that cannot be expressed in any other
+ way.
+ 
address@hidden (*SKIP)
address@hidden (*SKIP)
+ 
+ This verb is like @code{(*PRUNE)}, except that if the pattern is
+ unanchored, the "bumpalong" advance is not to the next character, but
+@@ -2383,7 +2383,7 @@
+ attempt would start at the second character instead of skipping on to
+ @samp{c}.
+ 
address@hidden (*THEN)
address@hidden (*THEN)
+ 
+ This verb causes a skip to the next alternation if the rest of the
+ pattern does not match. That is, it cancels pending backtracking, but
============================================================
--- patches/series	dfcefe50bc0a318947c49406a12e52f7b2d649a9
+++ patches/series	17ff0966a419e398ba21252c4236f9fd684d6e1e
@@ -7,4 +7,5 @@ 10-mtn-ignore-syntax-error-test.diff
 06-broken-dns-work-around.diff
 07-support-boost-1.53.diff
 10-mtn-ignore-syntax-error-test.diff
+08-texinfo-fix.diff
 90-stacktrace-on-crash.diff