[cg3] 02/02: Imported Debian patch 1.0.0~r12254-1
Tino Didriksen
tinodidriksen-guest at moszumanska.debian.org
Mon Jun 26 09:57:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
tinodidriksen-guest pushed a commit to branch master
in repository cg3.
commit ef475f4cf50c4a7cbff8fc1fbe8649791cb2fee9
Merge: 43155d1 6dedb6b
Author: Tino Didriksen <tino at didriksen.cc>
Date: Wed May 24 14:26:26 2017 +0200
Imported Debian patch 1.0.0~r12254-1
CMakeLists.txt | 23 +-
ChangeLog | 951 ++++++++++++------------
README.md | 8 +-
TODO | 4 +
clang-format.pl | 2 +-
cmake.sh | 3 +-
debian/changelog | 6 +
debian/control | 15 +-
debian/copyright | 8 +-
debian/{libcg3-0.install => libcg3-1.install} | 0
debian/{libcg3-0.postinst => libcg3-1.postinst} | 0
debian/rules | 1 +
debian/watch | 2 +-
emacs/cg.el | 119 +--
manual/cmdreference.xml | 25 +-
manual/compatibility.xml | 6 +-
manual/grammar.xml | 20 +
manual/installation.xml | 26 +-
manual/man/cg-comp.1 | 8 +-
manual/man/cg-conv.1 | 6 +-
manual/man/cg-proc.1 | 4 +-
manual/man/cg3-autobin.pl.1 | 4 +-
manual/man/vislcg3.1 | 12 +-
manual/manual.xml | 2 +-
manual/probabilistic.xml | 4 +-
manual/rules.xml | 42 +-
manual/sets.xml | 21 +-
manual/tags.xml | 16 +-
newsletters/2017-05-20.txt | 49 ++
scripts/CG3_External.pm | 14 +-
scripts/cg-strictify | 202 +++++
scripts/cg3-autobin.pl.in | 12 +-
scripts/external.pl | 2 +-
scripts/external_text.pl | 16 +-
scripts/profile-revisions.php | 12 +-
src/AST.hpp | 11 +-
src/ApertiumApplicator.cpp | 76 +-
src/ApertiumApplicator.hpp | 3 +-
src/BinaryGrammar.cpp | 2 +-
src/BinaryGrammar.hpp | 6 +-
src/BinaryGrammar_read.cpp | 38 +-
src/BinaryGrammar_read_10043.cpp | 20 +-
src/BinaryGrammar_write.cpp | 58 +-
src/CMakeLists.txt | 16 +-
src/Cohort.cpp | 50 +-
src/Cohort.hpp | 10 +-
src/CohortIterator.cpp | 21 +-
src/CohortIterator.hpp | 2 +-
src/ContextualTest.cpp | 8 +-
src/ContextualTest.hpp | 4 +-
src/FSTApplicator.cpp | 28 +-
src/FSTApplicator.hpp | 2 +-
src/FormatConverter.cpp | 2 +-
src/FormatConverter.hpp | 2 +-
src/Grammar.cpp | 272 +++----
src/Grammar.hpp | 13 +-
src/GrammarApplicator.cpp | 153 ++--
src/GrammarApplicator.hpp | 36 +-
src/GrammarApplicator_matchSet.cpp | 139 +++-
src/GrammarApplicator_reflow.cpp | 111 +--
src/GrammarApplicator_runContextualTest.cpp | 120 +--
src/GrammarApplicator_runGrammar.cpp | 56 +-
src/GrammarApplicator_runRules.cpp | 784 ++++++++++++-------
src/GrammarWriter.cpp | 71 +-
src/GrammarWriter.hpp | 2 +-
src/IGrammarParser.hpp | 2 +-
src/MatxinApplicator.cpp | 36 +-
src/MatxinApplicator.hpp | 2 +-
src/MweSplitApplicator.cpp | 34 +-
src/MweSplitApplicator.hpp | 2 +-
src/NicelineApplicator.cpp | 44 +-
src/NicelineApplicator.hpp | 2 +-
src/PlaintextApplicator.cpp | 29 +-
src/PlaintextApplicator.hpp | 4 +-
src/Reading.cpp | 8 +-
src/Reading.hpp | 6 +-
src/Relabeller.cpp | 58 +-
src/Relabeller.hpp | 10 +-
src/Rule.cpp | 22 +-
src/Rule.hpp | 64 +-
src/Set.cpp | 4 +-
src/Set.hpp | 6 +-
src/SingleWindow.cpp | 12 +-
src/SingleWindow.hpp | 2 +-
src/Strings.cpp | 12 +-
src/Strings.hpp | 8 +-
src/Tag.cpp | 36 +-
src/Tag.hpp | 16 +-
src/TagTrie.hpp | 32 +-
src/TextualParser.cpp | 182 ++++-
src/TextualParser.hpp | 9 +-
src/Window.cpp | 28 +-
src/Window.hpp | 2 +-
src/bloomish.hpp | 6 +-
src/cg-mwesplit.cpp | 4 +-
src/cg-relabel.cpp | 4 +-
src/cg3.h | 7 +-
src/cg_comp.cpp | 2 +-
src/cg_conv.cpp | 9 +-
src/cg_proc.cpp | 7 +-
src/flat_unordered_map.hpp | 4 +-
src/flat_unordered_set.hpp | 4 +-
src/inlines.hpp | 79 +-
src/interval_vector.hpp | 4 +-
src/istream.hpp | 4 +-
src/libcg3.cpp | 44 +-
src/main.cpp | 43 +-
src/options.hpp | 6 +-
src/options_conv.hpp | 6 +-
src/parser_helpers.hpp | 48 +-
src/process.hpp | 2 +-
src/scoped_stack.hpp | 2 +-
src/sorted_vector.hpp | 19 +-
src/stdafx.hpp | 19 +-
src/test_libcg3.c | 2 +-
src/uextras.cpp | 2 +-
src/uextras.hpp | 4 +-
src/version.hpp | 20 +-
test/Apertium/T_Flush/expected.txt | Bin 0 -> 105 bytes
test/Apertium/T_Flush/grammar.cg3 | 7 +
test/Apertium/T_Flush/input.txt | Bin 0 -> 147 bytes
test/Apertium/T_Flush/run.pl | 61 ++
test/T_Append/expected.txt | 6 +-
test/T_Append/grammar.cg3 | 2 +-
test/T_Dependency_Loops/grammar.cg3 | 2 +-
test/T_External/run.pl | 2 +-
test/T_JumpExecute/expected.txt | 18 +-
test/T_MapAdd_Different/expected.txt | 6 +-
test/T_MapAdd_Different/grammar.cg3 | 8 +-
test/T_MapAdd_Different/grammar.cg3b.10043 | Bin 907 -> 0 bytes
test/T_MapAdd_Different/input.txt | 2 +-
test/T_Movement/expected.txt | 12 +-
test/T_Movement/grammar.cg3 | 2 +
test/T_Movement/grammar.cg3b.10043 | Bin 1574 -> 0 bytes
test/T_Movement/input.txt | 14 +-
test/T_MweSplit/run.pl | 4 +-
test/T_RelabelList/run.pl | 2 +-
test/T_RelabelList_Apertium/run.pl | 2 +-
test/T_RelabelSet/run.pl | 2 +-
test/T_RemCohort/expected.txt | 40 +-
test/T_RemCohort/grammar.cg3 | 3 +
test/T_RemCohort/grammar.cg3b.10043 | Bin 2239 -> 0 bytes
test/T_RemCohort/input.txt | 22 +-
test/T_SetOps/expected.txt | 18 +-
test/T_SetOps/grammar.cg3 | 3 +-
test/T_SetOps/grammar.cg3b.10043 | Bin 1437 -> 0 bytes
test/T_SubReadings_Apertium/run.pl | 2 +-
test/T_SubstituteNil/grammar.cg3 | 5 +-
test/T_SubstituteNil/grammar.cg3b.10043 | Bin 543 -> 0 bytes
test/T_SubstituteNil/input.txt | 2 +-
test/clean.sh | 2 +-
test/runall.pl | 4 +-
152 files changed, 3049 insertions(+), 1988 deletions(-)
diff --cc debian/changelog
index bb0d9e2,0000000..3fd6d0b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,0 +1,54 @@@
++cg3 (1.0.0~r12254-1) unstable; urgency=low
++
++ * Updated to latest upstream release.
++
++ -- Tino Didriksen <tino at didriksen.cc> Wed, 24 May 2017 14:26:26 +0200
++
+cg3 (0.9.9~r11624-1) unstable; urgency=low
+
+ [ Tino Didriksen ]
+ * Updated to latest upstream from svn:
+ + Fixes assert failure and segfault.
+ * Disabled static libraries.
+
+ [ Kartik Mistry ]
+ * debian/control:
+ + Updated Standards-Version to 3.9.8
+
+ -- Kartik Mistry <kartik at debian.org> Tue, 07 Jun 2016 09:02:35 +0530
+
+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 7cf3300,0000000..68741cc
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,62 -1,0 +1,63 @@@
+Source: cg3
+Section: science
+Priority: optional
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
+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.49.0),
+ libicu-dev (>= 4.8)
+Standards-Version: 3.9.8
- Homepage: http://visl.sdu.dk/cg3.html
++Homepage: https://visl.sdu.dk/cg3.html
+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}),
++Depends: libcg3-1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
+Provides: vislcg3
+Conflicts: vislcg3
+Replaces: vislcg3
++Suggests: libdigest-sha-perl
+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
++ See https://visl.sdu.dk/cg3.html for more documentation
+
- Package: libcg3-0
++Package: libcg3-1
+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
++ See https://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}
++Depends: libcg3-1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+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
++ See https://visl.sdu.dk/cg3.html for more documentation
diff --cc debian/copyright
index 33232a4,0000000..45dff8c
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,110 -1,0 +1,110 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cg3
+Upstream-Contact: Tino Didriksen <tino at didriksen.cc>
- Source: http://visl.sdu.dk/cg3.html
++Source: https://visl.sdu.dk/cg3.html
+
+Files: *
- Copyright: 2007-2016 GrammarSoft ApS <info at grammarsoft.com>
++Copyright: 2007-2017 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-2016 Kevin Brubeck Unhammer <unhammer at fsfe.org>
++Copyright: 2010-2017 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
++Copyright: 1995-2017 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/libcg3-1.install
index 9503874,0000000..9503874
mode 100644,000000..100644
--- a/debian/libcg3-1.install
+++ b/debian/libcg3-1.install
diff --cc debian/libcg3-1.postinst
index 7df96b6,0000000..7df96b6
mode 100644,000000..100644
--- a/debian/libcg3-1.postinst
+++ b/debian/libcg3-1.postinst
diff --cc debian/rules
index 16b7565,0000000..264253d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,0 +1,22 @@@
+#!/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
++export LC_ALL=C.UTF-8
+
+
+%:
+ dh $@ --fail-missing --parallel
diff --cc debian/watch
index b7ebb25,0000000..eb12e97
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- http://visl.sdu.dk/download/cg3/cg3-(.+)\.tar\.bz2
++https://visl.sdu.dk/download/cg3/cg3-(.+)\.tar\.bz2
--
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