[cg3] 02/03: Imported Debian patch 0.9.9~r10822-1

[Tino Didriksen]

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

tinodidriksen-guest pushed a commit to branch master
in repository cg3.

commit ee9c17d4e99bc27fefe56ee95bce4ee4951598f4
Merge: b8843e5 cf22645
Author: Tino Didriksen <mail at tinodidriksen.com>
Date:   Tue Jun 30 14:32:50 2015 +0200

    Imported Debian patch 0.9.9~r10822-1

 CMakeLists.txt                              |   9 ++++--
 ChangeLog                                   |  34 ++++++++++----------
 debian/changelog                            |   4 +--
 debian/control                              |   2 +-
 scripts/profile-revisions.php               |  22 ++++++-------
 src/GrammarApplicator.hpp                   |   5 +--
 src/GrammarApplicator_matchSet.cpp          |  16 ++++++----
 src/GrammarApplicator_reflow.cpp            |  47 +++++++++++++++++-----------
 src/GrammarApplicator_runContextualTest.cpp |  27 ++++++++--------
 src/GrammarApplicator_runRules.cpp          |  44 +++++++++++++++++---------
 src/version.hpp                             |   2 +-
 test/T_BasicSubstitute/expected.txt         |   3 +-
 test/T_BasicSubstitute/grammar.cg3          |   3 ++
 test/T_BasicSubstitute/grammar.cg3b.10043   | Bin 2155 -> 0 bytes
 vapply.sh                                   |   4 +--
 vparse.sh                                   |   4 +--
 16 files changed, 131 insertions(+), 95 deletions(-)

diff --cc debian/changelog
index 34e896c,0000000..b9bb7a6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,0 +1,41 @@@
- cg3 (0.9.9~r10817-1) unstable; urgency=low
++cg3 (0.9.9~r10822-1) unstable; urgency=low
 +
 +  * Updated to latest from svn. Fixes assert failure and segfault.
 +
-  -- Tino Didriksen <mail at tinodidriksen.com>  Mon, 29 Jun 2015 09:12:50 +0200
++ -- Tino Didriksen <mail at tinodidriksen.com>  Tue, 30 Jun 2015 14:32:50 +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..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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cg3.git