[Python-modules-commits] [pyparsing] 02/03: record new upstream branch created by importing pyparsing_2.1.4+dfsg1.orig.tar.gz and merge it

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository pyparsing.

commit 2d3e935b8d2e0d2e35a7cce0e6e54563662f7baf
Merge: 46a3190 e766cb2
Author: Barry Warsaw <barry at python.org>
Date:   Tue May 17 14:23:34 2016 -0400

    record new upstream branch created by importing pyparsing_2.1.4+dfsg1.orig.tar.gz and merge it

 CHANGES                                            |   48 +-
 PKG-INFO                                           |    2 +-
 debian/.git-dpm                                    |   14 +-
 htmldoc/api-objects.txt                            |   52 +-
 htmldoc/class-tree.html                            |    6 +-
 htmldoc/help.html                                  |    2 +-
 htmldoc/identifier-index.html                      |  298 +-
 htmldoc/module-tree.html                           |    2 +-
 htmldoc/pyparsing-module.html                      |   13 +-
 htmldoc/pyparsing-pysrc.html                       | 7983 ++++++++++----------
 htmldoc/pyparsing.And-class.html                   |    3 +-
 htmldoc/pyparsing.CaselessKeyword-class.html       |    3 +-
 htmldoc/pyparsing.CaselessLiteral-class.html       |    3 +-
 htmldoc/pyparsing.CharsNotIn-class.html            |    3 +-
 htmldoc/pyparsing.Combine-class.html               |    3 +-
 htmldoc/pyparsing.Dict-class.html                  |    3 +-
 htmldoc/pyparsing.Each-class.html                  |    3 +-
 htmldoc/pyparsing.Empty-class.html                 |    3 +-
 htmldoc/pyparsing.FollowedBy-class.html            |    3 +-
 htmldoc/pyparsing.Forward-class.html               |    3 +-
 htmldoc/pyparsing.GoToColumn-class.html            |    3 +-
 htmldoc/pyparsing.Group-class.html                 |    3 +-
 htmldoc/pyparsing.Keyword-class.html               |    3 +-
 htmldoc/pyparsing.LineEnd-class.html               |    3 +-
 htmldoc/pyparsing.LineStart-class.html             |    3 +-
 htmldoc/pyparsing.Literal-class.html               |    3 +-
 htmldoc/pyparsing.MatchFirst-class.html            |   10 +-
 htmldoc/pyparsing.NoMatch-class.html               |    3 +-
 htmldoc/pyparsing.NotAny-class.html                |    3 +-
 htmldoc/pyparsing.OneOrMore-class.html             |    3 +-
 htmldoc/pyparsing.OnlyOnce-class.html              |    2 +-
 htmldoc/pyparsing.Optional-class.html              |    3 +-
 htmldoc/pyparsing.Or-class.html                    |    3 +-
 htmldoc/pyparsing.ParseBaseException-class.html    |    2 +-
 htmldoc/pyparsing.ParseElementEnhance-class.html   |    3 +-
 htmldoc/pyparsing.ParseException-class.html        |    2 +-
 htmldoc/pyparsing.ParseExpression-class.html       |    3 +-
 htmldoc/pyparsing.ParseFatalException-class.html   |    2 +-
 htmldoc/pyparsing.ParseResults-class.html          |    2 +-
 htmldoc/pyparsing.ParseSyntaxException-class.html  |    2 +-
 htmldoc/pyparsing.ParserElement-class.html         |   85 +-
 htmldoc/pyparsing.QuotedString-class.html          |    3 +-
 ...nce-class.html => pyparsing.Recipes-class.html} |  157 +-
 .../pyparsing.RecursiveGrammarException-class.html |    2 +-
 htmldoc/pyparsing.Regex-class.html                 |    3 +-
 htmldoc/pyparsing.Regex.compiledREtype-class.html  |    2 +-
 htmldoc/pyparsing.SkipTo-class.html                |    3 +-
 htmldoc/pyparsing.StringEnd-class.html             |    3 +-
 htmldoc/pyparsing.StringStart-class.html           |    3 +-
 htmldoc/pyparsing.Suppress-class.html              |    3 +-
 htmldoc/pyparsing.Token-class.html                 |    3 +-
 htmldoc/pyparsing.TokenConverter-class.html        |    3 +-
 htmldoc/pyparsing.White-class.html                 |    3 +-
 htmldoc/pyparsing.Word-class.html                  |    3 +-
 htmldoc/pyparsing.WordEnd-class.html               |    3 +-
 htmldoc/pyparsing.WordStart-class.html             |    3 +-
 htmldoc/pyparsing.ZeroOrMore-class.html            |    3 +-
 ....html => pyparsing.pyparsing_common-class.html} |  177 +-
 htmldoc/redirect.html                              |    2 +-
 htmldoc/toc-everything.html                        |    3 +-
 htmldoc/toc-pyparsing-module.html                  |    3 +-
 pyparsing.egg-info/PKG-INFO                        |    2 +-
 pyparsing.egg-info/SOURCES.txt                     |    2 +
 pyparsing.py                                       |  273 +-
 64 files changed, 4927 insertions(+), 4331 deletions(-)

diff --cc debian/.git-dpm
index e845b15,0000000..da432a9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 022befb36aafa07524e358d2f1efb838d90a5ee5
- 022befb36aafa07524e358d2f1efb838d90a5ee5
- 022befb36aafa07524e358d2f1efb838d90a5ee5
- 022befb36aafa07524e358d2f1efb838d90a5ee5
- pyparsing_2.1.1+dfsg1.orig.tar.gz
- f6e4ee1ee1740457ca9f642f8efcc32203ae7eff
- 1054819
++e766cb2d7ba516e6bd5086ad801a909ebc03f774
++e766cb2d7ba516e6bd5086ad801a909ebc03f774
++e766cb2d7ba516e6bd5086ad801a909ebc03f774
++e766cb2d7ba516e6bd5086ad801a909ebc03f774
++pyparsing_2.1.4+dfsg1.orig.tar.gz
++f5eca602a0db79822a656e83932a432fbbe7408e
++1070020
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyparsing.git