[cg3] 02/02: Imported Debian patch 0.9.9~r10784-1
Tino Didriksen
tinodidriksen-guest at moszumanska.debian.org
Sun Jun 21 17:25:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
tinodidriksen-guest pushed a commit to branch master
in repository cg3.
commit d6018b066be208f6f23702a9566f9c27918fee7d
Merge: 9db6db5 9b32cea
Author: Tino Didriksen <mail at tinodidriksen.com>
Date: Sun Jun 21 18:59:50 2015 +0200
Imported Debian patch 0.9.9~r10784-1
CMakeLists.txt | 23 +-
ChangeLog | 947 +++++++++-------------
TODO | 8 +-
cg3.g | 7 +-
debian/changelog | 6 +
debian/control | 2 +-
debian/copyright | 32 +-
emacs/cg.el | 44 +-
get-boost.sh | 2 +-
include/exec-stream/exec-stream.cpp | 466 -----------
include/exec-stream/exec-stream.h | 163 ----
include/exec-stream/posix/exec-stream-helpers.cpp | 842 -------------------
include/exec-stream/posix/exec-stream-helpers.h | 239 ------
include/exec-stream/posix/exec-stream-impl.cpp | 386 ---------
include/exec-stream/win/exec-stream-helpers.cpp | 727 -----------------
include/exec-stream/win/exec-stream-helpers.h | 183 -----
include/exec-stream/win/exec-stream-impl.cpp | 315 -------
include/posix/popen_plus.c | 183 +++++
include/posix/popen_plus.h | 56 ++
{win32 => include/win32}/getopt.c | 0
{win32 => include/win32}/getopt.h | 0
manual/cgkeywords.xml | 26 +
manual/cmdreference.xml | 116 +--
manual/contexts.xml | 17 +
manual/grammar.xml | 74 ++
manual/sets.xml | 35 +-
manual/tags.xml | 40 +
scripts/cg3-autobin.pl.in | 6 +-
src/ApertiumApplicator.cpp | 6 +-
src/BinaryGrammar_read.cpp | 204 +++--
src/BinaryGrammar_read_10043.cpp | 196 ++---
src/BinaryGrammar_write.cpp | 92 ++-
src/CMakeLists.txt | 15 +-
src/ContextualTest.cpp | 12 +-
src/ContextualTest.hpp | 18 +-
src/FSTApplicator.cpp | 58 +-
src/FSTApplicator.hpp | 4 +
src/Grammar.cpp | 228 ++++--
src/Grammar.hpp | 32 +-
src/GrammarApplicator.cpp | 104 ++-
src/GrammarApplicator.hpp | 110 +--
src/GrammarApplicator_matchSet.cpp | 228 +++---
src/GrammarApplicator_reflow.cpp | 36 +-
src/GrammarApplicator_runContextualTest.cpp | 83 +-
src/GrammarApplicator_runGrammar.cpp | 6 +-
src/GrammarApplicator_runRules.cpp | 119 ++-
src/GrammarWriter.cpp | 9 +-
src/IGrammarParser.hpp | 3 +-
src/NicelineApplicator.cpp | 6 +-
src/PlaintextApplicator.cpp | 2 +-
src/Reading.cpp | 19 +
src/Reading.hpp | 1 +
src/Set.cpp | 4 +
src/Strings.cpp | 12 +-
src/Strings.hpp | 10 +
src/Tag.cpp | 282 +------
src/Tag.hpp | 24 +-
src/TagTrie.hpp | 22 +
src/TextualParser.cpp | 762 +++++++++++------
src/TextualParser.hpp | 18 +
src/all_cg_comp.cpp | 1 +
src/all_cg_conv.cpp | 1 +
src/all_cg_proc.cpp | 1 +
src/all_vislcg3.cpp | 1 +
src/cg_comp.cpp | 2 +
src/cg_conv.cpp | 21 +
src/cg_proc.cpp | 2 +
src/inlines.hpp | 57 +-
src/main.cpp | 20 +-
src/options.hpp | 116 +--
src/options_conv.hpp | 6 +
src/parser_helpers.hpp | 324 ++++++++
src/process.hpp | 199 +++++
src/stdafx.hpp | 5 +-
src/uextras.cpp | 4 +-
src/uextras.hpp | 35 +
src/version.hpp | 4 +-
test/T_Dependency_Loops/grammar.cg3 | 9 +-
test/T_MapAdd_Different/args.txt | 2 +-
test/T_MapAdd_Different/expected.txt | 3 +-
test/T_RegExp/expected.txt | 3 +-
test/T_RegExp/grammar.cg3 | 2 +
test/T_RegExp/grammar.cg3b.10043 | Bin 3827 -> 4052 bytes
test/T_Templates/expected.txt | 7 +-
test/T_Templates/grammar.cg3 | 3 +
test/T_Templates/grammar.cg3b.10043 | Bin 5270 -> 0 bytes
test/T_Templates/input.txt | 5 +-
vapply.sh | 4 +-
win32/libgen.c | 25 -
win32/libgen.h | 14 -
90 files changed, 3249 insertions(+), 5297 deletions(-)
diff --cc debian/changelog
index 2eef671,0000000..e710af1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,0 +1,35 @@@
++cg3 (0.9.9~r10784-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..82b75da
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>,
+ Kartik Mistry <kartik at debian.org>
+Build-Depends: cmake (>= 2.8.9),
+ debhelper (>= 9.0),
- libboost-dev (>= 1.48),
++ libboost1.48-dev | libboost-dev (>= 1.49.0),
+ libicu-dev (>= 4.8)
+Standards-Version: 3.9.6
+Homepage: http://visl.sdu.dk/cg3.html
+Vcs-Git: git://anonscm.debian.org/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
+ 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 03af435,0000000..fa3e0df
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,126 -1,0 +1,102 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cg3
+Upstream-Contact: Tino Didriksen <mail at tinodidriksen.com>
+Source: http://visl.sdu.dk/cg3.html
+
+Files: *
+Copyright: 2007-2014 GrammarSoft ApS <info at grammarsoft.com>
+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>
+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/exec-stream/*
- Copyright: 2004 Artem Khodush
- License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1) Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- 2) Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- 3) Neither the name of the ORGANIZATION nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
++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
+ 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
+ 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
--
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