[cg3] 02/02: Imported Debian patch 0.9.8.10157-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 4f4966ac47b74beda44a3a749e310b18c325d7af
Merge: b2cf88f 22ea26f
Author: Tino Didriksen <mail at tinodidriksen.com>
Date:   Fri Oct 3 09:15:01 2014 +0000

    Imported Debian patch 0.9.8.10157-1

 CMakeLists.txt          | 20 +++++++++++-----
 TODO                    |  5 ++++
 debian/changelog        |  5 ++--
 debian/control          | 14 +++++------
 debian/libcg3-0.install |  1 -
 debian/libcg3-0.symbols | 62 -------------------------------------------------
 debian/watch            |  2 +-
 emacs/cg.el             |  1 +
 get-boost.sh            |  2 +-
 manual/tags.xml         | 10 --------
 src/CMakeLists.txt      | 25 +++++++-------------
 src/FSTApplicator.cpp   | 23 +++++++++++++-----
 src/TextualParser.cpp   | 18 +++++++-------
 src/cg_conv.cpp         |  2 ++
 src/inlines.hpp         | 13 ++++++++---
 15 files changed, 76 insertions(+), 127 deletions(-)

diff --cc debian/changelog
index 2d7f670,0000000..9142b64
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,5 @@@
- cg3 (0.9.8.10080-1) experimental; urgency=low
++cg3 (0.9.8.10157-1) experimental; urgency=low
 +
-   [ Tino Didriksen ]
 +  * Initial release (Closes: #475452)
 +
-  -- Kartik Mistry <kartik at debian.org>  Wed, 24 Sep 2014 15:21:25 +0530
++ -- Tino Didriksen <mail at tinodidriksen.com>  Fri, 3 Oct 2014 09:15:01 +0000
diff --cc debian/control
index fe38662,0000000..94d7540
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,60 -1,0 +1,58 @@@
 +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),
-                libboost1.48-dev | libboost-dev (>= 1.49.0),
-                libicu-dev (>= 4.8)
++Build-Depends:
++	cmake (>= 2.8.9),
++	debhelper (>= 9.0),
++	libboost1.48-dev | libboost-dev (>= 1.49.0),
++	libicu-dev (>= 4.8)
 +Standards-Version: 3.9.5
 +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}
++Depends: libcg3-0 (= ${binary:Version}), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 +Provides: vislcg3
 +Conflicts: 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
 +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/libcg3-0.install
index a2448b6,0000000..9503874
mode 100644,000000..100644
--- a/debian/libcg3-0.install
+++ b/debian/libcg3-0.install
@@@ -1,2 -1,0 +1,1 @@@
 +debian/tmp/usr/lib/*/*.so.*
- debian/tmp/usr/lib/*/cg3
diff --cc debian/watch
index 9a45623,0000000..df568ec
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://beta.visl.sdu.dk/download/vislcg3/vislcg3-(.+)\.tar\.bz2
++http://visl.sdu.dk/download/vislcg3/cg3-(.+)\.tar\.bz2

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