Import Debian changes 0.5.2-1

hfst-ospell (0.5.2-1) unstable; urgency=low

  [ Tino Didriksen ]
  * Update to latest upstream
  * Fixes build with GCC 10 (closes: #957334)
  * Incorporates ICU patch
  * debian/control:
    + Binary update: libhfstospell10 -> libhfstospell11
    + Updated Standards-Version to 4.5.0
  [ Kartik Mistry ]
  * Added debian/gitlab-ci.yml

.travis.yml

-sudo: required
-dist: trusty
-language: cpp
-
-addons:
-  apt:
-    packages:
-      - libxml++2.6-dev
-      - libarchive-dev
-
-script:
-  - autoreconf -fi
-  - ./configure --disable-static --enable-zhfst
-  - make -j3
-  - make -j1 check

ChangeLog

-678d45d (HEAD -> master, origin/master, origin/HEAD) Treat all tests as XFAIL_TESTS if zhfst support is disabled.
+a949408 (HEAD -> master, origin/master, origin/HEAD) ICU is namespaced in newer versions (fixes #42)
+e272cd2 Change correction finding order (issue #28); Require C++1y (C++14)
+0521ea9 (tag: v0.5.0) Copyright extends to 2018.
+e16dcbb Ready for release 0.5.0.
+678d45d Treat all tests as XFAIL_TESTS if zhfst support is disabled.
 a3f39d9 Merge pull request #31 from hfst/configure-explicit-error
 bc1c9ea Separate counters (fixes #37, closes #38)
 a4aeae0 Post-case-mangling unique test

ChangeLog.old

-4f2026c (HEAD -> master, origin/master, origin/HEAD) Add missing files to dist.
+678d45d (HEAD -> master, origin/master, origin/HEAD) Treat all tests as XFAIL_TESTS if zhfst support is disabled.
+a3f39d9 Merge pull request #31 from hfst/configure-explicit-error
+bc1c9ea Separate counters (fixes #37, closes #38)
+a4aeae0 Post-case-mangling unique test
+1d088e1 Avoid shadowing multicharacter ascii-beginning symbols
+69ab95d Merge pull request #35 from unhammer/renamespace-hfst_ol
+d39b93c rename hfst_ol namespace to hfst_ospell to avoid conflicts
+eccbd6f Bump actual version; Modernize for() loops
+a9919f4 Merge pull request #33 from unhammer/analysisSymbols
+f36de02 bump minor version because of new API function
+019f303 New API fn analyseSymbols giving unconcatenated vector<string>'s
+da508b7 Dirty hack to parse XML a bit better; ToDo: use actual portable XML library
+dad7c5c Minimal XML parsing to get locale, title, and description for Voikko and other frontends
+f40d4b5 (origin/configure-explicit-error) let './configure --enable-zhfst' fail if no libarchive found
+a737b52 When using help2man remember -n description
+1fc3fca Update copyright and authors listing
+d791a41 (tag: v0.4.5) Release 0.4.5.
+4f2026c Add missing files to dist.
 bae21c3 Forgot to commit configure.ac... Update hfst-ospell manual and add man pages to dist.
 7c8690a (tag: v0.4.4) Ready for release 0.4.4.
 671efe6 Trusty has C++11

INSTALL

-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

Makefile.am

@@ -54,7 +54,7 @@ endif
 libhfstospell_la_SOURCES=hfst-ol.cc ospell.cc \
 						 ZHfstOspeller.cc ZHfstOspellerXmlMetadata.cc
 libhfstospell_la_CXXFLAGS=$(AM_CXXFLAGS) $(CXXFLAGS) $(PKG_CXXFLAGS)
-libhfstospell_la_LDFLAGS=-no-undefined -version-info 10:0:0 \
+libhfstospell_la_LDFLAGS=-no-undefined -version-info 11:0:0 \
 						 $(PKG_LIBS)
 
 # link sample program against library here

NEWS

@@ -4,6 +4,13 @@ NEWS for hfst-ospell
 This file contains all noteworthy changes in HFST-ospell development between
 releases. For full listing of changes see ChangeLog.
 
+Noteworthy changes in 0.5.1
+---------------------------
+
+* change correction finding order (fixes issue #28)
+* require C++1y (C++14)
+* observe ICU namespacing (fixes issue #42)
+
 Noteworthy changes in 0.5.0
 ---------------------------
 

ZHfstOspeller.cc

@@ -37,6 +37,12 @@ using std::map;
 #include "hfst-ol.h"
 #include "ZHfstOspeller.h"
 
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#include <windows.h>
+#endif
+
 namespace hfst_ospell
   {
 
@@ -85,19 +91,30 @@ inline Transducer* transducer_to_mem(archive* ar, archive_entry* entry) {
 }
 
 inline char* extract_to_tmp_dir(archive* ar) {
-    char* rv = strdup("/tmp/zhfstospellXXXXXXXX");
+#ifdef WIN32
+    char rv[MAX_PATH+1];
+    if (!GetTempPathA(MAX_PATH, rv)) {
+        throw ZHfstZipReadingError("Could not get temporary path");
+    }
+    strcat(rv, "zhfstospellXXXXXX");
+    mktemp(rv);
+    int temp_fd = open(rv, _O_CREAT | _O_TRUNC | _O_RDWR);
+#else
+    char rv[] = "/tmp/zhfstospellXXXXXXXX";
     int temp_fd = mkstemp(rv);
+#endif
     int rr = archive_read_data_into_fd(ar, temp_fd);
     if ((rr != ARCHIVE_EOF) && (rr != ARCHIVE_OK)) {
         throw ZHfstZipReadingError("Archive not EOF'd or OK'd");
     }
     close(temp_fd);
-    return rv;
+    return strdup(rv);
 }
 
 inline Transducer* transducer_to_tmp_dir(archive* ar) {
     char *filename = extract_to_tmp_dir(ar);
     FILE* f = fopen(filename, "rb");
+    free(filename);
     if (f == nullptr) {
         throw ZHfstTemporaryWritingError("reading acceptor back from temp file");
     }
@@ -397,6 +414,7 @@ ZHfstOspeller::read_zhfst(const string& filename)
             catch (...) {
                 char* temporary = extract_to_tmp_dir(ar);
                 metadata_.read_xml(temporary);
+                free(temporary);
             }
           }
         else

configure.ac

@@ -17,7 +17,7 @@
 
 # autoconf requirements
 AC_PREREQ([2.62])
-AC_INIT([hfstospell], [0.5.0], [hfst-bugs@helsinki.fi], [hfstospell], [http://hfst.github.io])
+AC_INIT([hfstospell], [0.5.2], [hfst-bugs@helsinki.fi], [hfstospell], [http://hfst.github.io])
 
 LT_PREREQ([2.2.6])
 
@@ -34,16 +34,14 @@ AC_CONFIG_HEADERS([config.h])
 HFSTOSPELL_NAME=hfstospell
 HFSTOSPELL_MAJOR=0
 HFSTOSPELL_MINOR=5
-HFSTOSPELL_EXTENSION=.0
+HFSTOSPELL_EXTENSION=.2
 HFSTOSPELL_VERSION=$HFSTOSPELL_MAJOR.$HFSTOSPELL_MINOR$HFSTOSPELL_EXTENSION
 AC_SUBST(HFSTOSPELL_MAJOR)
 AC_SUBST(HFSTOSPELL_MINOR)
 AC_SUBST(HFSTOSPELL_VERSION)
 AC_SUBST(HFSTOSPELL_NAME)
 
-# Check for pkg-config first - the configuration won't work if it isn't available:
-AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
-AS_IF([test "x$PKGCONFIG" = xno], [AC_MSG_ERROR([pkg-config is required - please install])])
+PKG_PROG_PKG_CONFIG
 AC_PATH_PROG([DOXYGEN], [doxygen], [false])
 AM_CONDITIONAL([CAN_DOXYGEN], [test "x$DOXYGEN" != xfalse])
 
@@ -143,18 +141,19 @@ AC_TYPE_SIZE_T
 AC_C_BIGENDIAN
 
 # Checks for library functions
-AC_FUNC_MALLOC
 AC_CHECK_FUNCS([strndup error])
 # Checks for system services
 
-# Checks for highest supported C++ standard
+# Require highest supported C++ standard
 AC_LANG(C++)
-AX_CHECK_COMPILE_FLAG([-std=c++17], [CXXFLAGS="$CXXFLAGS -std=c++17"], [
- AX_CHECK_COMPILE_FLAG([-std=c++1z], [CXXFLAGS="$CXXFLAGS -std=c++1z"], [
-  AX_CHECK_COMPILE_FLAG([-std=c++14], [CXXFLAGS="$CXXFLAGS -std=c++14"], [
-   AX_CHECK_COMPILE_FLAG([-std=c++1y], [CXXFLAGS="$CXXFLAGS -std=c++1y"], [
-    AX_CHECK_COMPILE_FLAG([-std=c++11], [CXXFLAGS="$CXXFLAGS -std=c++11"], [
-     AC_MSG_ERROR([could not enable C++11 or newer])
+AX_CHECK_COMPILE_FLAG([-std=c++20], [CXXFLAGS="$CXXFLAGS -std=c++20"], [
+ AX_CHECK_COMPILE_FLAG([-std=c++2a], [CXXFLAGS="$CXXFLAGS -std=c++2a"], [
+  AX_CHECK_COMPILE_FLAG([-std=c++17], [CXXFLAGS="$CXXFLAGS -std=c++17"], [
+   AX_CHECK_COMPILE_FLAG([-std=c++1z], [CXXFLAGS="$CXXFLAGS -std=c++1z"], [
+    AX_CHECK_COMPILE_FLAG([-std=c++14], [CXXFLAGS="$CXXFLAGS -std=c++14"], [
+     AX_CHECK_COMPILE_FLAG([-std=c++1y], [CXXFLAGS="$CXXFLAGS -std=c++1y"], [
+      AC_MSG_ERROR([Could not enable at least C++1y (C++14) - upgrade your compiler])
+     ])
     ])
    ])
   ])

debian/changelog

+hfst-ospell (0.5.2-1) unstable; urgency=low
+
+  [ Tino Didriksen ]
+  * Update to latest upstream
+  * Fixes build with GCC 10 (closes: #957334)
+  * Incorporates ICU patch
+  * debian/control:
+    + Binary update: libhfstospell10 -> libhfstospell11
+    + Updated Standards-Version to 4.5.0
+  [ Kartik Mistry ]
+  * Added debian/gitlab-ci.yml
+
+ -- Kartik Mistry <kartik@debian.org>  Mon, 25 May 2020 18:29:25 +0530
+
 hfst-ospell (0.5.0-2) unstable; urgency=medium
 
   * Added patch to fix FTBS with ICU 63.1 (Closes: #913505).

debian/compat

-11
\ No newline at end of file

debian/control

 Source: hfst-ospell
 Section: science
 Priority: optional
-Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Science Team <debian-science-maintainers@alioth-lists.debian.net>
 Uploaders: Tino Didriksen <tino@didriksen.cc>,
            Kartik Mistry <kartik@debian.org>
 Build-Depends: autoconf,
-               automake,
-               debhelper (>= 11),
+               debhelper-compat (= 13),
                libarchive-dev,
                libicu-dev,
-               libtool,
                pkg-config,
                zip
-Standards-Version: 4.2.1
+Standards-Version: 4.5.0
 Homepage: https://github.com/hfst/hfst-ospell
 Vcs-Git: https://salsa.debian.org/science-team/hfst-ospell.git
 Vcs-Browser: https://salsa.debian.org/science-team/hfst-ospell
+Rules-Requires-Root: no
 
 Package: hfst-ospell
 Architecture: any
-Depends: libhfstospell10 (= ${binary:Version}),
+Depends: libhfstospell11 (= ${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: libhfstospell10
+Package: libhfstospell11
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: libhfstospell
-Conflicts: libhfstospell
-Replaces: libhfstospell
+Conflicts: libhfstospell, libhfstospell10
+Replaces: libhfstospell, libhfstospell10
 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.
@@ -42,7 +41,6 @@ Description: HFST spell checker runtime libraries
 
 Package: hfst-ospell-dev
 Architecture: any
-Multi-Arch: same
 Section: devel
 Depends: hfst-ospell (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: HFST spell checker development files

debian/copyright

@@ -2,7 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://github.com/hfst/hfst-ospell
 
 Files: *
-Copyright: 2009-2017, Department of Modern Languages, University of Helsinki
+Copyright: 2009-2020, Department of Modern Languages, University of Helsinki
  See AUTHORS for more copyrights.
 License: Apache-2.0
 

debian/gitlab-ci.yml

+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+  RELEASE: 'unstable'

debian/patches/hfst-ospell_ICU_63.1.patch

-From a949408067fa783b0cfc942baf55cc69b743adc5 Mon Sep 17 00:00:00 2001
-From: Tino Didriksen <mail@tinodidriksen.com>
-Date: Thu, 20 Sep 2018 09:54:23 +0000
-Subject: [PATCH] ICU is namespaced in newer versions (fixes #42)
-
----
- office.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/office.cc b/office.cc
-index ecb63c8..822e55a 100644
---- a/office.cc
-+++ b/office.cc
-@@ -49,6 +49,7 @@
- #include <unicode/uloc.h>
- #include <unicode/uchar.h>
- #include <unicode/unistr.h>
-+using namespace icu;
- 
- #include "ZHfstOspeller.h"
- 

debian/patches/series

-hfst-ospell_ICU_63.1.patch

debian/rules

@@ -10,7 +10,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ --fail-missing --with autoreconf
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-static --enable-zhfst --without-libxmlpp --without-tinyxml2
@@ -23,3 +23,6 @@ ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
 	make -j1 check
 endif
+
+override_dh_missing:
+	dh_missing --fail-missing

hfst-ospell-office.1

-.TH HFST-OSPELL-OFFICE "5" "March 2018" "hfst-ospell-office " "User Commands"
+.TH HFST-OSPELL-OFFICE "1" "March 2018" "hfst-ospell-office " "User Commands"
 .SH NAME
 hfst-ospell-office \- Spell checker tool based on HFST
 .SH SYNOPSIS

hfst-ospell.1

 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH HFST-OSPELL "5" "March 2018" "hfst-ospell " "User Commands"
+.TH HFST-OSPELL "1" "March 2018" "hfst-ospell " "User Commands"
 .SH NAME
 hfst-ospell \- Spell checker tool based on HFST
 .SH SYNOPSIS