Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362334 )
Change subject: cg3: New upstream version
......................................................................
cg3: New upstream version
Other changes:
* Upstream library soname bump, so package name is updated.
* Updated copyright and watch files.
* Set locale to C.UTF-8 to avoid build issues.
Bug: T171406
Change-Id: I9758ec1920afc7fae08acb7544b8108f7004ed80
---
M debian/changelog
M debian/control
M debian/copyright
D debian/libcg3-0.symbols
R debian/libcg3-1.install
R debian/libcg3-1.postinst
M debian/rules
M debian/watch
8 files changed, 28 insertions(+), 74 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 582e114..0868807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cg3 (1.0.0~r12254-1+wmf1) jessie-wikimedia; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Updated dependencies due to library name change.
+ + Updated Homepage URL.
+ + Suggests: libdigest-sha-perl
+ * Updated debian/copyright and debian/watch.
+ * debian/rules:
+ + Set locale to C.UTF-8.
+ * Removed symbols file.
+
+ -- Kartik Mistry <kar...@debian.org> Fri, 30 Jun 2017 08:57:13 +0530
+
cg3 (0.9.9~r11624-1+wmf1) jessie; urgency=low
* Rebuild for Jessie
diff --git a/debian/control b/debian/control
index 7cf3300..68741cc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,19 +9,20 @@
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.
@@ -31,9 +32,9 @@
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}
@@ -46,17 +47,17 @@
.
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 --git a/debian/copyright b/debian/copyright
index 33232a4..45dff8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: cg3
Upstream-Contact: Tino Didriksen <t...@didriksen.cc>
-Source: http://visl.sdu.dk/cg3.html
+Source: https://visl.sdu.dk/cg3.html
Files: *
-Copyright: 2007-2016 GrammarSoft ApS <i...@grammarsoft.com>
+Copyright: 2007-2017 GrammarSoft ApS <i...@grammarsoft.com>
License: GPL-3+
License: GPL-3+
@@ -25,7 +25,7 @@
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
Files: emacs/*
-Copyright: 2010-2016 Kevin Brubeck Unhammer <unham...@fsfe.org>
+Copyright: 2010-2017 Kevin Brubeck Unhammer <unham...@fsfe.org>
License: GPL-2+
License: GPL-2+
@@ -77,7 +77,7 @@
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
diff --git a/debian/libcg3-0.symbols b/debian/libcg3-0.symbols
deleted file mode 100644
index f09347f..0000000
--- a/debian/libcg3-0.symbols
+++ /dev/null
@@ -1,62 +0,0 @@
-libcg3.so.0 libcg3-0 #MINVER#
- (optional=templinst|c++)"std::basic_string<unsigned short,
std::char_traits<unsigned short>, std::allocator<unsigned short>
>::_M_leak_hard()@Base" 0.9.8.9567
- (optional=templinst|c++)"std::basic_string<unsigned short,
std::char_traits<unsigned short>, std::allocator<unsigned short>
>::assign(std::basic_string<unsigned short, std::char_traits<unsigned short>,
std::allocator<unsigned short> > const&)@Base" 0.9.8.9567
-
(optional=templinst|c++)"boost::unordered::detail::node_constructor<std::allocator<boost::unordered::detail::ptr_node<std::pair<unsigned
int const, CG3::Tag*> > > >::~node_constructor()@Base" 0.9.8.9567
-
(optional=templinst|c++)"boost::unordered::detail::node_constructor<std::allocator<boost::unordered::detail::ptr_node<std::pair<unsigned
int const, CG3::Tag*> > > >::~node_constructor()@Base" 0.9.8.9567
-
(optional=templinst|c++|regex)"^boost::unordered::detail::prime_list_template<.*?>::value@Base"
0.9.8.9567
- (optional=templinst|c++)"std::basic_string<unsigned short,
std::char_traits<unsigned short>, std::allocator<unsigned short>
>::_Rep::_S_empty_rep_storage@Base" 0.9.8.9567
- (optional=templinst|c++|regex)"^std::basic_string<unsigned short,
std::char_traits<unsigned short>, std::allocator<unsigned short>
>::_M_mutate(.*?)@Base" 0.9.8.9567
- (optional=templinst|c++)"std::_List_base<CG3::Tag*, std::allocator<CG3::Tag*>
>::_M_clear()@Base" 0.9.8.9567
- (optional=templinst|c++|regex)"^std::vector<unsigned int,
std::allocator<unsigned int>
>::_M_fill_insert\(__gnu_cxx::__normal_iterator<unsigned int\*,
std::vector<unsigned int, std::allocator<unsigned int> > >, .*?, unsigned int
const&\)@Base" 0.9.8.9567
- (optional=templinst|c++)"void std::vector<unsigned int,
std::allocator<unsigned int> >::_M_emplace_back_aux<unsigned int
const&>(unsigned int const&)@Base" 0.9.8.9567
-
(optional=templinst)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIJRKjEEEvDpOT_@Base
0.9.8.9567
- cg3_applicator_create@Base 0.9.8.9567
- cg3_applicator_free@Base 0.9.8.9567
- cg3_applicator_setflags@Base 0.9.8.9567
- cg3_applicator_setoption@Base 0.9.8.9567
- cg3_cleanup@Base 0.9.8.9567
- cg3_cohort_addreading@Base 0.9.8.9567
- cg3_cohort_create@Base 0.9.8.9567
- cg3_cohort_free@Base 0.9.8.9567
- cg3_cohort_getdependency@Base 0.9.8.9567
- cg3_cohort_getid@Base 0.9.8.9567
- cg3_cohort_getreading@Base 0.9.8.9567
- cg3_cohort_getwordform@Base 0.9.8.9567
- cg3_cohort_numreadings@Base 0.9.8.9567
- cg3_cohort_setdependency@Base 0.9.8.9567
- cg3_cohort_setwordform@Base 0.9.8.9567
- cg3_grammar_free@Base 0.9.8.9567
- cg3_grammar_load@Base 0.9.8.9567
- cg3_init@Base 0.9.8.9567
- cg3_reading_addtag@Base 0.9.8.9567
- cg3_reading_create@Base 0.9.8.9567
- cg3_reading_free@Base 0.9.8.9567
- cg3_reading_getsubreading@Base 0.9.8.9567
- cg3_reading_gettag@Base 0.9.8.9567
- cg3_reading_gettrace@Base 0.9.8.9567
- cg3_reading_numsubreadings@Base 0.9.8.9567
- cg3_reading_numtags@Base 0.9.8.9567
- cg3_reading_numtraces@Base 0.9.8.9567
- cg3_reading_setsubreading@Base 0.9.8.9567
- cg3_sentence_addcohort@Base 0.9.8.9567
- cg3_sentence_copy@Base 0.9.8.9567
- cg3_sentence_free@Base 0.9.8.9567
- cg3_sentence_getcohort@Base 0.9.8.9567
- cg3_sentence_new@Base 0.9.8.9567
- cg3_sentence_numcohorts@Base 0.9.8.9567
- cg3_sentence_runrules@Base 0.9.8.9567
- cg3_subreading_create@Base 0.9.8.9567
- cg3_subreading_free@Base 0.9.8.9567
- cg3_tag_create_u16@Base 0.9.8.9567
- cg3_tag_create_u32@Base 0.9.8.9567
- cg3_tag_create_u8@Base 0.9.8.9567
- cg3_tag_create_u@Base 0.9.8.9567
- cg3_tag_create_w@Base 0.9.8.9567
- cg3_tag_gettext_u16@Base 0.9.8.9567
- cg3_tag_gettext_u32@Base 0.9.8.9567
- cg3_tag_gettext_u8@Base 0.9.8.9567
- cg3_tag_gettext_u@Base 0.9.8.9567
- cg3_tag_gettext_w@Base 0.9.8.9567
-
_ZNSt6vectorISt4pairIjPN3CG33TagEESaIS4_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS4_S6_EEmRKS4_@Base
0.9.8.10080
-
_ZNSt6vectorISt4pairIjPN3CG33TagEESaIS4_EE19_M_emplace_back_auxIIRKS4_EEEvDpOT_@Base
0.9.8.10080
-
_ZNSt6vectorISt4pairIjPN3CG33TagEESaIS4_EE19_M_emplace_back_auxIJRKS4_EEEvDpOT_@Base
0.9.8.10080
diff --git a/debian/libcg3-0.install b/debian/libcg3-1.install
similarity index 100%
rename from debian/libcg3-0.install
rename to debian/libcg3-1.install
diff --git a/debian/libcg3-0.postinst b/debian/libcg3-1.postinst
similarity index 100%
rename from debian/libcg3-0.postinst
rename to debian/libcg3-1.postinst
diff --git a/debian/rules b/debian/rules
index 16b7565..264253d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+export LC_ALL=C.UTF-8
%:
diff --git a/debian/watch b/debian/watch
index b7ebb25..eb12e97 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://visl.sdu.dk/download/cg3/cg3-(.+)\.tar\.bz2
+https://visl.sdu.dk/download/cg3/cg3-(.+)\.tar\.bz2
--
To view, visit https://gerrit.wikimedia.org/r/362334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9758ec1920afc7fae08acb7544b8108f7004ed80
Gerrit-PatchSet: 3
Gerrit-Project: operations/debs/contenttranslation/cg3
Gerrit-Branch: master
Gerrit-Owner: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: KartikMistry <kartik.mis...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
