[hfst-ospell] 02/02: Imported Debian patch 0.4.3~r338-1
Tino Didriksen
tinodidriksen-guest at moszumanska.debian.org
Tue Jan 10 20:50:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
tinodidriksen-guest pushed a commit to branch master
in repository hfst-ospell.
commit 4ce6cd878b1e2ac325a21ac705b3518cb02f74ce
Merge: ba1e704 545c13e
Author: Tino Didriksen <tino at didriksen.cc>
Date: Mon Dec 19 11:37:01 2016 +0100
Imported Debian patch 0.4.3~r338-1
.gitignore | 22 +
.travis.yml | 15 +
ChangeLog | 1827 ++++----------------
Makefile.am | 103 +-
NEWS | 19 +-
README | 47 +-
ZHfstOspeller.cc | 235 ++-
ZHfstOspeller.h | 56 +-
ZHfstOspellerXmlMetadata.cc | 41 +-
ZHfstOspellerXmlMetadata.h | 2 +
autogen.sh | 2 +-
configure.ac | 24 +-
debian/changelog | 8 +
debian/control | 10 +-
debian/copyright | 4 +-
...bhfstospell5.install => libhfstospell8.install} | 0
...fstospell5.postinst => libhfstospell8.postinst} | 0
debian/patches/hfst-ospell_01_notimestamp.diff | 61 -
debian/patches/hfst-ospell_02_xfail.diff | 13 +
debian/patches/series | 2 +-
debian/rules | 10 +-
debian/watch | 5 +-
hfst-ol.cc | 362 +++-
hfst-ol.h | 77 +-
hfst-ospell-office.1 | 2 +-
hfst-ospell.1 | 2 +-
hfstol-stdafx.h | 44 +
main-cicling.cc | 1 -
main-fsmnlp-2012.cc | 1 -
main-norvig.cc | 1 -
main-survey.cc | 1 -
main.cc | 1 -
office.cpp => office.cc | 2 -
ol-exceptions.h | 3 +-
ospell.cc | 63 +-
ospell.h | 21 +-
acceptor.basic.txt => tests/acceptor.basic.txt | 0
analyse-spell.sh => tests/analyse-spell.sh | 2 +-
analyser.default.txt => tests/analyser.default.txt | 0
bad-errormodel.sh => tests/bad-errormodel.sh | 2 +-
tests/bad_errormodel.zhfst | Bin 0 -> 1408 bytes
basic-edit1.sh => tests/basic-edit1.sh | 2 +-
basic-zhfst.sh => tests/basic-zhfst.sh | 2 +-
basic_test.xml => tests/basic_test.xml | 0
.../empty-descriptions.sh | 2 +-
empty-locale.sh => tests/empty-locale.sh | 2 +-
empty-titles.sh => tests/empty-titles.sh | 2 +-
empty-zhfst.sh => tests/empty-zhfst.sh | 3 +-
.../empty_descriptions.xml | 0
tests/empty_descriptions.zhfst | Bin 0 -> 1265 bytes
empty_locale.xml => tests/empty_locale.xml | 0
tests/empty_locale.zhfst | Bin 0 -> 1400 bytes
empty_titles.xml => tests/empty_titles.xml | 0
tests/empty_titles.zhfst | Bin 0 -> 1370 bytes
errmodel.basic.txt => tests/errmodel.basic.txt | 0
errmodel.edit1.txt => tests/errmodel.edit1.txt | 0
.../errmodel.extrachars.txt | 0
no-errormodel.sh => tests/no-errormodel.sh | 2 +-
no_errmodel.xml => tests/no_errmodel.xml | 0
tests/no_errormodel.zhfst | Bin 0 -> 972 bytes
tests/speller_analyser.zhfst | Bin 0 -> 3298 bytes
tests/speller_basic.zhfst | Bin 0 -> 1405 bytes
tests/speller_edit1.zhfst | Bin 0 -> 3245 bytes
test.strings => tests/test.strings | 0
trailing-spaces.sh => tests/trailing-spaces.sh | 2 +-
trailing_spaces.xml => tests/trailing_spaces.xml | 0
tests/trailing_spaces.zhfst | Bin 0 -> 1410 bytes
windows-Makefile.am | 4 +-
68 files changed, 1031 insertions(+), 2081 deletions(-)
diff --cc debian/changelog
index 8ecc93d,0000000..6616a19
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,0 +1,45 @@@
++hfst-ospell (0.4.3~r338-1) unstable; urgency=medium
++
++ * Update to latest upstream release.
++ * Decoupled from HFST and now assumes zhfst files are little-endian
++ * Runs and passes tests again (closes: #824119)
++
++ -- Tino Didriksen <tino at didriksen.cc> Mon, 19 Dec 2016 11:37:01 +0100
++
+hfst-ospell (0.4.0~r4643-4) unstable; urgency=medium
+
+ [ Tino Didriksen ]
+ * debian/rules:
+ + Skipped breaking tests.
+ * debian/control:
+ + Fixed Vcs-* URL.
+
+ -- Kartik Mistry <kartik at debian.org> Tue, 12 Apr 2016 14:45:15 +0530
+
+hfst-ospell (0.4.0~r4643-3) unstable; urgency=low
+
+ [ Kartik Mistry ]
+ * Upload to unstable.
+
+ [ Tino Didriksen ]
+ * debian/rules:
+ + Removed parallel build option to re-enable tests.
+
+ -- Kartik Mistry <kartik at debian.org> Fri, 26 Feb 2016 21:07:01 +0530
+
+hfst-ospell (0.4.0~r4643-2) experimental; urgency=low
+
+ [ Tino Didriksen ]
+ * Disable broken tests (closes: #815157)
+
+ [ Kartik Mistry ]
+ * Update Standards-Version to 3.9.7
+
+ -- Kartik Mistry <kartik at debian.org> Wed, 24 Feb 2016 22:20:53 +0530
+
+hfst-ospell (0.4.0~r4643-1) experimental; urgency=low
+
+ [ Tino Didriksen ]
+ * Initial release (closes: #813488)
+
+ -- Kartik Mistry <kartik at debian.org> Tue, 02 Feb 2016 19:14:36 +0530
diff --cc debian/control
index ccad418,0000000..fc030b8
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,53 -1,0 +1,51 @@@
+Source: hfst-ospell
+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: autoconf,
+ automake,
+ autotools-dev,
+ debhelper (>= 9.0),
+ dh-autoreconf,
- hfst,
+ libarchive-dev,
+ libicu-dev,
+ libtool,
- libxml++2.6-dev,
+ pkg-config,
+ zip
- Standards-Version: 3.9.7
- Homepage: https://www.ling.helsinki.fi/kieliteknologia/tutkimus/hfst/
++Standards-Version: 3.9.8
++Homepage: https://github.com/hfst/hfst-ospell
+Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/hfst-ospell.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/hfst-ospell.git
+
+Package: hfst-ospell
+Architecture: any
- Depends: libhfstospell5 (= ${binary:Version}),
++Depends: libhfstospell8 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Spell checker library and tool based on HFST
+ Minimal HFST optimized lookup format based spell checker library and
+ a demonstrational implementation of command line based spell checker.
+
- Package: libhfstospell5
++Package: libhfstospell8
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libhfstospell
+Conflicts: libhfstospell
+Replaces: libhfstospell
+Description: HFST spell checker runtime libraries
+ Minimal HFST optimized lookup format based spell checker library and
+ a demonstrational implementation of command line based spell checker.
+ .
+ This package provides runtime libraries for hfst-ospell.
+
+Package: hfst-ospell-dev
+Architecture: any
+Section: devel
+Depends: hfst-ospell (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: HFST spell checker development files
+ Minimal HFST optimized lookup format based spell checker library and
+ a demonstrational implementation of command line based spell checker.
+ .
+ This package provides development headers and libraries for hfst-ospell.
diff --cc debian/copyright
index fe48fcd,0000000..c55bf75
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,33 -1,0 +1,33 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Source: http://www.ling.helsinki.fi/kieliteknologia/tutkimus/hfst/
++Source: https://github.com/hfst/hfst-ospell
+
+Files: *
- Copyright: 2009-2016, Department of Modern Languages, University of Helsinki
++Copyright: 2009-2017, Department of Modern Languages, University of Helsinki
+ See AUTHORS for more copyrights.
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache License version 2.0
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+Files: m4/*
+Copyright: 2008 Guido U. Draheim <guidod at gmx.de>
+ 2011 Maarten Bosmans <mkbosmans at gmail.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".
diff --cc debian/libhfstospell8.install
index 9503874,0000000..9503874
mode 100644,000000..100644
--- a/debian/libhfstospell8.install
+++ b/debian/libhfstospell8.install
diff --cc debian/libhfstospell8.postinst
index 7df96b6,0000000..7df96b6
mode 100644,000000..100644
--- a/debian/libhfstospell8.postinst
+++ b/debian/libhfstospell8.postinst
diff --cc debian/patches/hfst-ospell_02_xfail.diff
index 0000000,0000000..18f1cb8
new file mode 100644
--- /dev/null
+++ b/debian/patches/hfst-ospell_02_xfail.diff
@@@ -1,0 -1,0 +1,13 @@@
++diff --git a/Makefile.am b/Makefile.am
++index 9423c5c..f097d43 100644
++--- a/Makefile.am
+++++ b/Makefile.am
++@@ -122,7 +122,7 @@ TESTS=tests/basic-zhfst.sh tests/basic-edit1.sh \
++ tests/empty-descriptions.sh tests/empty-titles.sh tests/empty-locale.sh \
++ tests/trailing-spaces.sh tests/bad-errormodel.sh tests/empty-zhfst.sh \
++ tests/analyse-spell.sh tests/no-errormodel.sh
++-XFAIL_TESTS=tests/empty-descriptions.sh tests/empty-titles.sh tests/empty-locale.sh tests/empty-zhfst.sh
+++XFAIL_TESTS=tests/empty-zhfst.sh
++
++ if CAN_DOXYGEN
++ doxygen:
diff --cc debian/patches/series
index 1c6a34e,0000000..f16fb99
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- hfst-ospell_01_notimestamp.diff
++hfst-ospell_02_xfail.diff
diff --cc debian/rules
index 00433a1,0000000..9cda02a
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,26 -1,0 +1,30 @@@
+#!/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
+
+%:
- dh $@ --parallel --with autoreconf
++ dh $@ --fail-missing --parallel --with autoreconf
+
+override_dh_auto_configure:
- dh_auto_configure -- --disable-static --enable-zhfst
++ dh_auto_configure -- --disable-static --enable-zhfst --without-libxmlpp --without-tinyxml2
++
++override_dh_auto_install:
++ dh_auto_install
++ find $(CURDIR) -type f -name '*.la' -exec rm -f '{}' \;
+
+override_dh_auto_test:
- # Skip, as it breaks in various unpredictable ways
++ make -j1 check
diff --cc debian/watch
index 40537c7,0000000..b235bb5
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,3 @@@
+version=3
- opts=filenamemangle=s/\S*download=//g \
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/hfst/hfst \
- .*=hfstospell(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
++opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/hfst-ospell-$1\.tar\.gz/ \
++ https://github.com/hfst/hfst-ospell/releases .*/v?(\d\S+)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hfst-ospell.git
More information about the debian-science-commits
mailing list