[cg3] 02/02: Imported Debian patch 0.9.9~r11624-1
Tino Didriksen
tinodidriksen-guest at moszumanska.debian.org
Sat Jun 4 20:04:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
tinodidriksen-guest pushed a commit to branch master
in repository cg3.
commit fce2ac6adc4d28065cd5f3f6c549cb3046f64923
Merge: 132d53d 94cb0af
Author: Tino Didriksen <tino at didriksen.cc>
Date: Wed May 25 11:27:01 2016 +0200
Imported Debian patch 0.9.9~r11624-1
.clang-format | 60 +
.editorconfig | 14 +
.travis.yml | 18 +
CMakeLists.txt | 27 +-
ChangeLog | 1801 +++++++-----------
README | 4 -
README.md | 15 +
TODO | 1 +
clang-format.pl | 108 ++
debian/changelog | 6 +
debian/control | 10 +-
debian/copyright | 14 +-
debian/docs | 2 +-
debian/rules | 2 +-
emacs/cg.el | 304 +--
get-boost.sh | 2 +-
manual/contexts.xml | 23 +-
manual/grammar.xml | 1 +
manual/manual.xml | 2 +-
manual/rules.xml | 56 +-
manual/templates.xml | 41 +-
src/AST.hpp | 230 +++
src/ApertiumApplicator.cpp | 135 +-
src/ApertiumApplicator.hpp | 60 +-
src/BinaryGrammar.cpp | 5 +-
src/BinaryGrammar.hpp | 43 +-
src/BinaryGrammar_read.cpp | 61 +-
src/BinaryGrammar_read_10043.cpp | 49 +-
src/BinaryGrammar_write.cpp | 40 +-
src/CMakeLists.txt | 25 +-
src/Cohort.cpp | 53 +-
src/Cohort.hpp | 124 +-
src/CohortIterator.cpp | 96 +-
src/CohortIterator.hpp | 169 +-
src/ContextualTest.cpp | 37 +-
src/ContextualTest.hpp | 184 +-
src/FSTApplicator.cpp | 59 +-
src/FSTApplicator.hpp | 3 +-
src/FormatConverter.cpp | 100 +-
src/FormatConverter.hpp | 42 +-
src/Grammar.cpp | 246 ++-
src/Grammar.hpp | 257 +--
src/GrammarApplicator.cpp | 374 ++--
src/GrammarApplicator.hpp | 514 ++---
src/GrammarApplicator_matchSet.cpp | 140 +-
src/GrammarApplicator_reflow.cpp | 217 ++-
src/GrammarApplicator_runContextualTest.cpp | 327 ++--
src/GrammarApplicator_runGrammar.cpp | 70 +-
src/GrammarApplicator_runRules.cpp | 707 +++++--
src/GrammarWriter.cpp | 33 +-
src/GrammarWriter.hpp | 54 +-
src/IGrammarParser.hpp | 27 +-
...ApertiumApplicator.cpp => MatxinApplicator.cpp} | 420 +++--
src/MatxinApplicator.hpp | 80 +
src/MweSplitApplicator.cpp | 174 ++
...celineApplicator.hpp => MweSplitApplicator.hpp} | 25 +-
src/NicelineApplicator.cpp | 69 +-
src/NicelineApplicator.hpp | 3 +-
src/PlaintextApplicator.cpp | 61 +-
src/PlaintextApplicator.hpp | 3 +-
src/Reading.cpp | 75 +-
src/Reading.hpp | 82 +-
src/Relabeller.cpp | 382 ++++
src/Relabeller.hpp | 89 +
src/Rule.cpp | 53 +-
src/Rule.hpp | 167 +-
src/Set.cpp | 53 +-
src/Set.hpp | 143 +-
src/SingleWindow.cpp | 22 +-
src/SingleWindow.hpp | 68 +-
src/Strings.cpp | 22 +-
src/Strings.hpp | 365 ++--
src/Tag.cpp | 91 +-
src/Tag.hpp | 209 +-
src/TagTrie.hpp | 345 ++--
src/TextualParser.cpp | 1990 ++++++++++----------
src/TextualParser.hpp | 104 +-
src/Window.cpp | 25 +-
src/Window.hpp | 67 +-
src/all_cg_conv.cpp | 1 +
src/all_cg_proc.cpp | 1 +
src/bloomish.hpp | 7 +-
src/cg-mwesplit.cpp | 127 ++
src/cg-relabel.cpp | 140 ++
src/cg3.h | 2 +-
src/cg_comp.cpp | 4 +-
src/cg_conv.cpp | 18 +-
src/cg_proc.cpp | 170 +-
src/flat_unordered_map.hpp | 33 +-
src/flat_unordered_set.hpp | 30 +-
src/icu_uoptions.cpp | 190 +-
src/inlines.hpp | 176 +-
src/interval_vector.hpp | 65 +-
src/istream.hpp | 37 +-
src/libcg3.cpp | 60 +-
src/macros.hpp | 42 -
src/main.cpp | 56 +-
src/options.hpp | 246 +--
src/options_conv.hpp | 94 +-
src/parser_helpers.hpp | 23 +-
src/process.hpp | 8 +-
src/{GrammarWriter.hpp => scoped_stack.hpp} | 72 +-
src/sorted_vector.hpp | 33 +-
src/stdafx.hpp | 33 +-
src/test_libcg3.c | 10 +-
src/uextras.cpp | 9 +-
src/uextras.hpp | 24 +-
src/version.hpp | 6 +-
.../{T_BasicAppend => T_Append}/expected.txt | 0
.../{T_BasicAppend => T_Append}/grammar.cg3 | 0
.../Apertium/{T_BasicAppend => T_Append}/input.txt | 0
test/Apertium/{T_BasicAppend => T_Append}/run.pl | 0
.../expected.txt | 0
.../grammar.cg3 | 0
.../input.txt | 0
.../{T_BasicContextTest => T_ContextTest}/run.pl | 0
.../{T_BasicDelimit => T_Delimit}/expected.txt | 0
.../{T_BasicDelimit => T_Delimit}/grammar.cg3 | 0
.../{T_BasicDelimit => T_Delimit}/input.txt | 0
test/Apertium/{T_BasicDelimit => T_Delimit}/run.pl | 0
test/Apertium/{T_BasicIff => T_Iff}/expected.txt | 0
test/Apertium/{T_BasicIff => T_Iff}/grammar.cg3 | 0
test/Apertium/{T_BasicIff => T_Iff}/input.txt | 0
test/Apertium/{T_BasicIff => T_Iff}/run.pl | 0
.../{T_BasicRemove => T_Remove}/expected.txt | 0
.../{T_BasicRemove => T_Remove}/grammar.cg3 | 0
.../Apertium/{T_BasicRemove => T_Remove}/input.txt | 0
test/Apertium/{T_BasicRemove => T_Remove}/run.pl | 0
.../{T_BasicSelect => T_Select}/expected.txt | 0
.../{T_BasicSelect => T_Select}/grammar.cg3 | 0
.../Apertium/{T_BasicSelect => T_Select}/input.txt | 0
test/Apertium/{T_BasicSelect => T_Select}/run.pl | 0
.../expected.txt | 0
.../grammar.cg3 | 0
.../{T_BasicSubstitute => T_Substitute}/input.txt | 0
.../{T_BasicSubstitute => T_Substitute}/run.pl | 0
test/{T_BasicAppend => T_Append}/expected.txt | 3 +
test/{T_BasicAppend => T_Append}/grammar.cg3 | 2 +
test/{T_BasicAppend => T_Append}/input.txt | 0
test/T_BasicAppend/grammar.cg3b.10043 | Bin 2071 -> 0 bytes
test/T_BasicDependency/grammar.cg3b.10043 | Bin 8729 -> 0 bytes
test/T_BasicIff/grammar.cg3 | 4 -
test/T_BasicSelect/grammar.cg3b.10043 | Bin 837 -> 0 bytes
.../expected.txt | 0
.../grammar.cg3 | 0
.../grammar.cg3b.10043 | Bin
.../input.txt | 0
test/{T_BasicDelimit => T_Delimit}/args.txt | 0
test/{T_BasicDelimit => T_Delimit}/expected.txt | 0
test/{T_BasicDelimit => T_Delimit}/grammar.cg3 | 0
.../grammar.cg3b.10043 | Bin
test/{T_BasicDelimit => T_Delimit}/input.txt | 0
test/{T_BasicDependency => T_Dependency}/args.txt | 0
.../expected.txt | 7 +-
.../grammar.cg3 | 6 +
test/{T_BasicDependency => T_Dependency}/input.txt | 0
test/{T_BasicIff => T_Iff}/expected.txt | 0
test/T_Iff/grammar.cg3 | 4 +
test/{T_BasicIff => T_Iff}/grammar.cg3b.10043 | Bin
test/{T_BasicIff => T_Iff}/input.txt | 0
test/T_MultipleSections/grammar.cg3 | 4 +-
test/T_MweSplit/expected.txt | 76 +
test/T_MweSplit/input.txt | 66 +
test/T_MweSplit/run.pl | 23 +
test/T_NumericalTags/expected.txt | 2 +-
test/T_Omniscan/expected.txt | 40 +-
test/T_RegExp/expected.txt | 3 +
test/T_RegExp/grammar.cg3 | 2 +
test/T_RegExp/grammar.cg3b.10043 | Bin 4052 -> 0 bytes
test/T_RegExp/input.txt | 3 +
test/T_RelabelList/expected.txt | 21 +
test/T_RelabelList/grammar.cg3 | 42 +
test/T_RelabelList/input.txt | 23 +
test/T_RelabelList/relabel.cg3r | 20 +
test/T_RelabelList/run.pl | 53 +
test/T_RelabelList_Apertium/expected.txt | 1 +
test/T_RelabelList_Apertium/grammar.cg3 | 3 +
test/T_RelabelList_Apertium/input.txt | 1 +
test/T_RelabelList_Apertium/relabel.cg3r | 1 +
test/T_RelabelList_Apertium/run.pl | 54 +
test/T_RelabelSet/expected.txt | 27 +
test/T_RelabelSet/grammar.cg3 | 22 +
test/T_RelabelSet/input.txt | 33 +
test/T_RelabelSet/relabel.cg3r | 6 +
test/T_RelabelSet/run.pl | 53 +
test/{T_BasicSelect => T_Select}/args.txt | 0
test/{T_BasicSelect => T_Select}/expected.txt | 2 +-
test/{T_BasicSelect => T_Select}/grammar.cg3 | 2 +
test/{T_BasicSelect => T_Select}/input.txt | 0
test/{T_BasicSubstitute => T_SplitCohort}/args.txt | 0
test/T_SplitCohort/expected.txt | 13 +
test/T_SplitCohort/grammar.cg3 | 12 +
test/T_SplitCohort/input.txt | 6 +
test/{T_BasicSubstitute => T_Substitute}/args.txt | 0
.../expected.txt | 2 +-
.../grammar.cg3 | 0
test/{T_BasicSubstitute => T_Substitute}/input.txt | 0
test/T_Templates/expected.txt | 5 +-
test/T_Templates/grammar.cg3 | 9 +-
test/T_Trace/grammar.cg3 | 6 +-
test/runall.pl | 8 +-
todo.sh | 2 +-
202 files changed, 8543 insertions(+), 6025 deletions(-)
diff --cc debian/changelog
index c8a3e13,0000000..f255b6f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,0 +1,49 @@@
++cg3 (0.9.9~r11624-1) unstable; urgency=low
++
++ * Updated to latest from svn.
++
++ -- Tino Didriksen <tino at didriksen.cc> Wed, 25 May 2016 11:27:01 +0200
++
+cg3 (0.9.9~r10827-1) unstable; urgency=low
+
+ * Updated to latest from svn.
+ * Fixes assert failure and segfault.
+ * Disabled static libraries.
+
+ -- Tino Didriksen <mail at tinodidriksen.com> Thu, 02 Jul 2015 11:41:02 +0200
+
+cg3 (0.9.9~r10793-1) unstable; urgency=low
+
+ * Updated to latest from svn.
+
+ -- Tino Didriksen <mail at tinodidriksen.com> Sun, 21 Jun 2015 18:59:50 +0200
+
+cg3 (0.9.9~r10439-2) unstable; urgency=low
+
+ * debian/control:
+ + Fixed FTBFS on buildds. Thanks to Pino Toscano <pino at debian.org> for
+ patch (Closes: #789471)
+
+ -- Kartik Mistry <kartik at debian.org> Sun, 21 Jun 2015 21:21:26 +0530
+
+cg3 (0.9.9~r10439-1) unstable; urgency=low
+
+ [ Tino Didriksen ]
+ * Updated to latest from svn.
+
+ [ Kartik Mistry ]
+ * Uploaded to unstable.
+
+ -- Kartik Mistry <kartik at debian.org> Sat, 20 Jun 2015 21:53:32 +0530
+
+cg3 (0.9.9~r10195-1) experimental; urgency=low
+
+ * Updated to latest from svn
+
+ -- Tino Didriksen <mail at tinodidriksen.com> Tue, 7 Oct 2014 14:36:01 +0000
+
+cg3 (0.9.9~r10190-1) experimental; urgency=low
+
+ * Initial release (Closes: #475452)
+
+ -- Tino Didriksen <mail at tinodidriksen.com> Fri, 3 Oct 2014 10:31:01 +0000
diff --cc debian/control
index 28a732f,0000000..53f6485
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,62 -1,0 +1,62 @@@
+Source: cg3
+Section: science
+Priority: optional
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
- Uploaders: Tino Didriksen <mail at tinodidriksen.com>,
++Uploaders: Tino Didriksen <tino at didriksen.cc>,
+ Kartik Mistry <kartik at debian.org>
+Build-Depends: cmake (>= 2.8.9),
+ debhelper (>= 9.0),
- libboost-dev (>= 1.48),
++ libboost-dev (>= 1.49.0),
+ libicu-dev (>= 4.8)
- Standards-Version: 3.9.6
++Standards-Version: 3.9.7
+Homepage: http://visl.sdu.dk/cg3.html
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/cg3.git
++Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/cg3.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/cg3.git
+
+Package: cg3
+Architecture: any
+Depends: libcg3-0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
+Provides: vislcg3
+Conflicts: vislcg3
+Replaces: vislcg3
+Description: Tools for using the 3rd edition of Constraint Grammar (CG-3)
+ Constraint Grammar compiler and applicator for the 3rd edition of CG
+ that is developed and maintained by VISL SDU and GrammarSoft ApS.
+ .
+ CG-3 can be used for disambiguation of morphology, syntax, semantics, etc;
+ dependency markup, target language lemma choice for MT, QA systems, and
+ much more. The core idea is that you choose what to do based on the whole
+ available context, as opposed to n-grams.
+ .
+ See http://visl.sdu.dk/cg3.html for more documentation
+
+Package: libcg3-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libcg3
+Conflicts: libcg3
+Replaces: libcg3
+Description: Runtime for CG-3
+ Runtime library for applications using the CG-3 API.
+ .
+ It is recommended to instrument the CLI tools instead of using this API.
+ .
+ See http://visl.sdu.dk/cg3.html for more documentation
+
+Package: libcg3-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libcg3-0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
- Description: Headers and static library to develop using the CG-3 library
++Description: Headers and shared files to develop using the CG-3 library
+ Development files to use the CG-3 API.
+ .
+ It is recommended to instrument the CLI tools instead of using this API.
+ .
+ See http://visl.sdu.dk/cg3.html for more documentation
diff --cc debian/copyright
index e6f5d35,0000000..33232a4
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,102 -1,0 +1,110 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cg3
- Upstream-Contact: Tino Didriksen <mail at tinodidriksen.com>
++Upstream-Contact: Tino Didriksen <tino at didriksen.cc>
+Source: http://visl.sdu.dk/cg3.html
+
+Files: *
- Copyright: 2007-2014 GrammarSoft ApS <info at grammarsoft.com>
++Copyright: 2007-2016 GrammarSoft ApS <info at grammarsoft.com>
++License: GPL-3+
++
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+Files: emacs/*
- Copyright: 2010-2013 Kevin Brubeck Unhammer <unhammer at fsfe.org>
++Copyright: 2010-2016 Kevin Brubeck Unhammer <unhammer at fsfe.org>
++License: GPL-2+
++
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: include/posix/popen_plus.*
+Copyright: 2001 Hamid Alipour
+License: public-domain
+ The author disclaims copyright to this source code.
+
+Files: include/cycle.h
+Copyright: 2003, 2007-8 Matteo Frigo
+ 2003, 2007-8 Massachusetts Institute of Technology
+License: Expat
++
++License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: include/uoptions.h
+ src/icu_uoptions.cpp
+Copyright: 1995-2014 International Business Machines Corporation and others
+License: ICU
++
++License: ICU
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, 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.
+ .
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+ .
+ A copy of the license is provided in the source tree as license.icu.txt
+ or can be read at http://icu-project.org/license
diff --cc debian/docs
index 724e084,0000000..6f77277
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,2 -1,0 +1,2 @@@
- README
++README.md
+TODO
diff --cc debian/rules
index e57627b,0000000..16b7565
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,0 +1,21 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+
+%:
- dh $@ --parallel
++ dh $@ --fail-missing --parallel
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cg3.git
More information about the debian-science-commits
mailing list