[Python-modules-commits] [simpleparse] 08/09: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sun Dec 25 10:03:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to branch master
in repository simpleparse.
commit d0b4a3ba15c825b444f48800bbc3c9a73a0066bb
Merge: c29e620 e9bf55f
Author: Vincent Bernat <bernat at debian.org>
Date: Sun Dec 25 11:02:09 2016 +0100
merge patched into master
debian/.git-dpm | 4 +-
.../patches/0001-doc-remove-SourceForge-logo.patch | 88 ++++++++++++++++++++++
debian/patches/series | 1 +
doc/common_problems.html | 6 --
doc/index.html | 3 -
doc/processing_result_trees.html | 6 --
doc/scanning_with_simpleparse.html | 5 --
doc/simpleparse_grammars.html | 5 +-
8 files changed, 92 insertions(+), 26 deletions(-)
diff --cc debian/.git-dpm
index 9e3cdfb,0000000..cd5541b
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
- 7d50954124663a123bd913ced1884e97fb87a8a3
- 7d50954124663a123bd913ced1884e97fb87a8a3
++e9bf55f2d14d538775432c276b565d43b14b671c
++e9bf55f2d14d538775432c276b565d43b14b671c
+7d50954124663a123bd913ced1884e97fb87a8a3
+7d50954124663a123bd913ced1884e97fb87a8a3
+simpleparse_2.2.0.orig.tar.gz
+784e550f2a644c16dbb1c4e995d360542dfb7610
+218082
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-doc-remove-SourceForge-logo.patch
index 0000000,0000000..628efc5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-doc-remove-SourceForge-logo.patch
@@@ -1,0 -1,0 +1,88 @@@
++From e9bf55f2d14d538775432c276b565d43b14b671c Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sun, 25 Dec 2016 11:01:51 +0100
++Subject: doc: remove SourceForge logo
++
++---
++ doc/common_problems.html | 6 ------
++ doc/index.html | 3 ---
++ doc/processing_result_trees.html | 6 ------
++ doc/scanning_with_simpleparse.html | 5 -----
++ doc/simpleparse_grammars.html | 5 +----
++ 5 files changed, 1 insertion(+), 24 deletions(-)
++
++diff --git a/doc/common_problems.html b/doc/common_problems.html
++index 97176bc3f2b0..e67885b959da 100644
++--- a/doc/common_problems.html
+++++ b/doc/common_problems.html
++@@ -133,12 +133,6 @@ tag-lists
++ </ul>
++ <a href="index.html">Up to index...</a><br>
++
++-<p align="center">A <a href="http://sourceforge.net"> <img
++- src="http://sourceforge.net/sflogo.php?group_id=55673&type=5"
++- width="210" height="62" border="0" alt="SourceForge Logo">
++- </a><br>
++- Open Source <a href="http://simpleparse.sourceforge.net/">project</a><br>
++- </p>
++ <br>
++ </body>
++ </html>
++diff --git a/doc/index.html b/doc/index.html
++index 617253bde90e..205e3b9ad0da 100644
++--- a/doc/index.html
+++++ b/doc/index.html
++@@ -339,7 +339,4 @@ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
++ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ PERFORMANCE OF THIS SOFTWARE!</p>
++-<p align="center">A <a href="http://sourceforge.net"> <img alt="SourceForge Logo" src="http://sourceforge.net/sflogo.php?group_id=55673&type=5" border="0" height="62" width="210"></a><br>
++-Open Source <a href="http://simpleparse.sourceforge.net/">project</a><br>
++-</p>
++ </body></html>
++diff --git a/doc/processing_result_trees.html b/doc/processing_result_trees.html
++index 9666febd7f8e..96c05054d49f 100644
++--- a/doc/processing_result_trees.html
+++++ b/doc/processing_result_trees.html
++@@ -227,12 +227,6 @@ results tree has a non-standard format that you need to explicitly watch
++ out for while processing the results.</p>
++ <a href="index.html">Up to index...</a><br>
++
++-<p align="center">A <a href="http://sourceforge.net"> <img
++- src="http://sourceforge.net/sflogo.php?group_id=55673&type=5"
++- width="210" height="62" border="0" alt="SourceForge Logo">
++- </a><br>
++- Open Source <a href="http://simpleparse.sourceforge.net/">project</a><br>
++- </p>
++ <br>
++ <br>
++ <br>
++diff --git a/doc/scanning_with_simpleparse.html b/doc/scanning_with_simpleparse.html
++index 014b943fc179..9a3fa3771cca 100644
++--- a/doc/scanning_with_simpleparse.html
+++++ b/doc/scanning_with_simpleparse.html
++@@ -142,10 +142,5 @@ results
++ tree in �<a href="./processing_result_trees.html">Processing Result
++ Trees</a>�.</p>
++ <a href="index.html">Up to index...</a><br>
++-<p align="center">A <a href="http://sourceforge.net"> <img
++- src="http://sourceforge.net/sflogo.php?group_id=55673&type=5"
++- width="210" height="62" border="0" alt="SourceForge Logo"></a><br>
++-Open Source <a href="http://simpleparse.sourceforge.net/">project</a><br>
++-</p>
++ </body>
++ </html>
++diff --git a/doc/simpleparse_grammars.html b/doc/simpleparse_grammars.html
++index 72c04add4b23..4b47b3b25b90 100644
++--- a/doc/simpleparse_grammars.html
+++++ b/doc/simpleparse_grammars.html
++@@ -502,7 +502,4 @@ the grammar used during parser generation is a manually generated
++ version found in the simpleparse.simpleparsegrammar module.</p>
++ <pre>declaration = r"""declarationset := declaration+<br>declaration := ts, (unreportedname/expandedname/name) ,ts,':',':'?,'=',seq_group<br><br>element_token := lookahead_indicator?, ts, negpos_indicator?,ts, (literal/range/group/name),ts, occurence_indicator?, ts, error_on_fail?<br><br>negpos_indicator := [-+]<br>lookahead_indicator := "?"<br>occurence_indicator := [+*?]<br>error_on_fail := "!", (ts,literal)?<br><br>>group< := '(' [...]
++ <a href="index.html">Up to index...</a><br>
++-<p align="center">A <a href="http://sourceforge.net"> <img alt="SourceForge Logo" src="http://sourceforge.net/sflogo.php?group_id=55673&type=5" border="0" height="62" width="210"> </a><br>
++-Open Source <a href="http://simpleparse.sourceforge.net/">project</a><br>
++-</p>
++-</body></html>
++\ No newline at end of file
+++</body></html>
diff --cc debian/patches/series
index 0000000,0000000..79b287d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-doc-remove-SourceForge-logo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/simpleparse.git
More information about the Python-modules-commits
mailing list