This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository hunspell.
commit aefadcda814a24b4cc69e88a7c75c0d0dcebf545 Merge: e79e9c8 55141bf Author: Rene Engelhard <[email protected]> Date: Thu Nov 1 20:35:20 2007 +0100 Imported Debian patch 1.2.1-1 ChangeLog | 173 +- Makefile.in | 1 - NEWS | 43 + THANKS | 7 + TODO | 4 - configure | 96 +- configure.ac | 22 +- debian/changelog | 6 +- debian/control | 4 +- debian/libhunspell-1.1-0.shlibs | 1 - debian/libhunspell-dev.links | 2 - ...hunspell-1.1-0.install => libhunspell1.install} | 0 debian/libhunspell1.shlibs | 1 + debian/patches/00list | 2 +- debian/patches/15_encds_static.dpatch | 19 - debian/patches/15_hunspell_pc_no_version.dpatch | 17 + debian/rules | 2 +- m4/Makefile.in | 1 - man/Makefile.in | 1 - man/hu/Makefile.in | 1 - man/hunspell.1 | 143 +- man/hunspell.4 | 347 +- src/Makefile.in | 1 - src/hunspell/Makefile.am | 16 +- src/hunspell/Makefile.in | 71 +- src/hunspell/affentry.cxx | 300 +- src/hunspell/affentry.hxx | 3 + src/hunspell/affixmgr.cxx | 881 +++-- src/hunspell/affixmgr.hxx | 73 +- src/hunspell/atypes.hxx | 45 +- src/hunspell/baseaffix.hxx | 37 +- src/hunspell/csutil.cxx | 374 +- src/hunspell/csutil.hxx | 62 +- src/hunspell/hashmgr.cxx | 285 +- src/hunspell/hashmgr.hxx | 26 +- src/hunspell/htypes.hxx | 28 +- src/hunspell/hunspell.cxx | 637 ++-- src/hunspell/hunspell.h | 54 + src/hunspell/hunspell.hxx | 71 +- src/hunspell/phonet.cxx | 294 ++ src/hunspell/phonet.hxx | 50 + src/hunspell/suggestmgr.cxx | 878 +++-- src/hunspell/suggestmgr.hxx | 46 +- src/parsers/Makefile.am | 2 +- src/parsers/Makefile.in | 5 +- src/parsers/testparser.cxx | 1 + src/parsers/textparser.hxx | 4 +- src/tools/Makefile.am | 19 +- src/tools/Makefile.in | 61 +- src/tools/analyze.cxx | 83 + src/tools/chmorph.cxx | 85 + src/tools/hunmorph.cxx | 61 - src/tools/hunspell.cxx | 6 +- src/tools/hunstem.cxx | 60 - src/tools/makealias | 79 +- src/win_api/Hunspell.rc | 14 +- src/win_api/Hunspell.sln | 28 +- src/win_api/Makefile.am | 3 +- src/win_api/Makefile.in | 4 +- src/win_api/README | 2 +- src/win_api/config.h | 11 +- src/win_api/hunspell.vcproj | 233 ++ .../{Hunspell.vcproj => libhunspell.vcproj} | 30 +- src/win_api/testparser.vcproj | 227 ++ tests/1463589.aff | 2 + tests/1463589_utf.aff | 2 + tests/1592880.aff | 2 + tests/1695964.aff | 2 + tests/1706659.aff | 2 +- tests/IJ.aff | 1 + tests/IJ.sug | 2 +- tests/Makefile.am | 31 +- tests/Makefile.in | 241 +- tests/alias2.aff | 6 +- tests/alias2.morph | 12 +- tests/alias3.morph | 8 +- tests/base.aff | 2 +- tests/base.sug | 4 +- tests/base_utf.aff | 9 +- tests/base_utf.dic | 6 +- tests/base_utf.good | 6 +- tests/base_utf.sug | 8 +- tests/base_utf.test | 2 +- tests/circumfix.aff | 6 +- tests/circumfix.dic | 2 +- tests/circumfix.morph | 12 +- tests/compoundrule5.dic | 26 +- tests/compoundrule5.morph | 21 +- tests/conditionalprefix.aff | 8 +- tests/conditionalprefix.dic | 4 +- tests/conditionalprefix.morph | 22 +- tests/i35725.sug | 4 +- tests/morph.aff | 12 + tests/morph.dic | 10 + tests/morph.good | 26 + tests/morph.morph | 48 + tests/{base_utf.test => morph.test} | 0 tests/needaffix2.dic | 8 +- tests/needaffix2.morph | 14 +- tests/ngram_utf_fix.aff | 21 + tests/ngram_utf_fix.dic | 2 + tests/ngram_utf_fix.good | 1 + tests/ngram_utf_fix.sug | 2 + tests/{base_utf.test => ngram_utf_fix.test} | 2 +- tests/ngram_utf_fix.wrong | 2 + tests/phone.aff | 255 ++ tests/phone.dic | 11 + tests/phone.sug | 1 + tests/{base_utf.test => phone.test} | 0 tests/phone.wrong | 1 + tests/rep.aff | 6 +- tests/rep.dic | 6 +- tests/rep.sug | 2 + tests/rep.wrong | 2 + tests/sug.aff | 2 + tests/sug.dic | 8 +- tests/sug.sug | 7 +- tests/sug.wrong | 5 + .../suggestiontest/List_of_common_misspellings.txt | 4020 ++++++++++++++++++++ tests/suggestiontest/Makefile.am | 6 + {src/win_api => tests/suggestiontest}/Makefile.in | 15 +- tests/suggestiontest/Makefile.orig | 7 + tests/suggestiontest/README | 8 + tests/suggestiontest/prepare | 35 + tests/suggestiontest/test | 23 + tests/{sug.aff => sugutf.aff} | 2 + tests/{sug.dic => sugutf.dic} | 8 +- tests/{sug.sug => sugutf.sug} | 7 +- tests/{base_utf.test => sugutf.test} | 0 tests/{sug.wrong => sugutf.wrong} | 5 + tests/test.sh | 8 +- tests/zeroaffix.morph | 17 +- 132 files changed, 9055 insertions(+), 2156 deletions(-) diff --cc debian/changelog index 0180fc1,0000000..883081f mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,215 -1,0 +1,215 @@@ - hunspell (1.1.9-2) unstable; urgency=low ++hunspell (1.2.1-1) experimental; urgency=low + - * make encds[] struct static, thanks Stefan Weil. ++ * New upstream release + - -- Rene Engelhard <[email protected]> Mon, 07 Apr 2008 00:13:37 +0200 ++ -- Rene Engelhard <[email protected]> Thu, 01 Nov 2007 20:35:20 +0100 + +hunspell (1.1.9-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> Mon, 30 Jul 2007 12:53:59 +0200 + +hunspell (1.1.8-2) unstable; urgency=low + + * libmyspell-dev: we need to depend on ${binary:Version}, not + ${source:Version}, thanks Lior Kaplan (closes: #433901) + + -- Rene Engelhard <[email protected]> Fri, 20 Jul 2007 15:54:07 +0200 + +hunspell (1.1.8-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> Tue, 17 Jul 2007 09:49:04 +0200 + +hunspell (1.1.7-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> Sun, 08 Jul 2007 23:56:51 +0200 + +hunspell (1.1.6-1) unstable; urgency=low + + * New upstream release + - the hunspell program has now input encoding support (closes: #350022) + + -- Rene Engelhard <[email protected]> Mon, 02 Jul 2007 13:39:33 +0200 + +hunspell (1.1.5-6) unstable; urgency=low + + * add (normally not needed) conflicts against old experimentals OOo + (see #416711) + + -- Rene Engelhard <[email protected]> Fri, 13 Apr 2007 15:07:53 +0200 + +hunspell (1.1.5-5) unstable; urgency=low + + * add info to hunspell(4) from SF tracker #1610863 how to convert aspell + dicts (closes: #324639) + + -- Rene Engelhard <[email protected]> Wed, 11 Apr 2007 16:11:04 +0200 + +hunspell (1.1.5-4) unstable; urgency=low + + * upload to unstable + + -- Rene Engelhard <[email protected]> Sun, 8 Apr 2007 12:25:23 +0200 + +hunspell (1.1.5-3) experimental; urgency=low + + * add new hunspell-tools package superseding libmyspell-devs tools + (package not built anymore) + - add ispellaff2myspell from libmyspell-dev here + - install munch and unmunch + - conflict and replace (against) libmyspell-dev + * install src/tools/example.cxx + + -- Rene Engelhard <[email protected]> Wed, 28 Mar 2007 16:29:52 +0200 + +hunspell (1.1.5-2) experimental; urgency=low + + * fix hunspell.hxx + + -- Rene Engelhard <[email protected]> Tue, 20 Mar 2007 16:19:18 +0100 + +hunspell (1.1.5-1) experimental; urgency=low + + * New upstream release + * debian/libhunspell-1.1-0.shlibs: bump, C API got added + * debian/patches/12_get_csconv.diff: temporary(?) buildfix, + the hunspell client needs get_csconv() still. + + -- Rene Engelhard <[email protected]> Tue, 20 Mar 2007 13:21:54 +0100 + +hunspell (1.1.4-8) experimental; urgency=low + + * add pkg-config file + + -- Rene Engelhard <[email protected]> Wed, 21 Feb 2007 19:33:31 +0100 + +hunspell (1.1.4-7) experimental; urgency=low + + * fix 02_usr_share_myspell_dicts.dpatch to not define + LIBDIR as /usr/share/hunspell _yet_, oops + + -- Rene Engelhard <[email protected]> Sun, 7 Jan 2007 18:43:26 +0100 + +hunspell (1.1.4-6) experimental; urgency=low + + * fix tail usage in tests.sh + * take patch from Fedora to build shared lib (libhunspell-1.1.so.0) + (closes: #324637); stop building _pic versions; build-depend on + libtool and automake1.9 + + -- Rene Engelhard <[email protected]> Mon, 1 Jan 2007 03:44:11 +0100 + +hunspell (1.1.4-5) unstable; urgency=high + + * add full MPL to debian/copyright (closes: #402324) + + -- Rene Engelhard <[email protected]> Sat, 9 Dec 2006 16:49:02 +0100 + +hunspell (1.1.4-4) unstable; urgency=medium + + * move fixes from last NMU to proper patches. + * make w_char structure tightly packed, needed on arm, thanks + Steinar H. Gunderson and remove XFAILED= from configure.ac + since the tests now fail because of unexpected passes. + (closes: #396528) + + -- Rene Engelhard <[email protected]> Thu, 16 Nov 2006 15:52:53 +0100 + +hunspell (1.1.4-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Set LANG=C at the top of tests/test.sh; fixes FTBFS when LANG is not C + during build (since sed behaves differently). + * Ensure we are working on signed characters when converting to and from + UTF-8 internally; should fix test failures and FTBFS on arm. + (Closes: #396528) + + -- Steinar H. Gunderson <[email protected]> Wed, 15 Nov 2006 20:06:28 +0100 + +hunspell (1.1.4-3) unstable; urgency=low + + * allow hunspell-dictionary-de in hunspells Depends:, thanks + Gerfried Fucks (closes: #359628) + + -- Rene Engelhard <[email protected]> Tue, 28 Mar 2006 20:08:34 +0200 + +hunspell (1.1.4-2) unstable; urgency=low + + * set LIBDIR to /usr/share/myspell/dicts (closes: #357249) + + -- Rene Engelhard <[email protected]> Thu, 16 Mar 2006 17:09:50 +0100 + +hunspell (1.1.4-1) unstable; urgency=low + + * New upstream release + * update debian/copyright for new GPL/LGPL/MPL tri-licensing + * add libncursesw5-dev builddep + + -- Rene Engelhard <[email protected]> Thu, 2 Feb 2006 16:46:12 +0100 + +hunspell (1.1.2-1) unstable; urgency=low + + * New upstream release + - should fix the infinite loops at the compound checks (closes: #338482) + * debian/patches/01_pic_versions.dpatch: autoreconf + * enable NLS again + + -- Rene Engelhard <[email protected]> Fri, 11 Nov 2005 14:23:40 +0100 + +hunspell (1.1.1-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> Wed, 9 Nov 2005 18:24:48 +0100 + +hunspell (1.1.0-2) unstable; urgency=low + + * upload to unstable. + + -- Rene Engelhard <[email protected]> Thu, 20 Oct 2005 01:13:42 +0200 + +hunspell (1.1.0-1) experimental; urgency=low + + * New upstream release + * run make check + + -- Rene Engelhard <[email protected]> Mon, 19 Sep 2005 23:48:20 +0200 + +hunspell (1.0.9-1) experimental; urgency=low + + * New upstream release + * Standards-Version: 3.6.2 (no changes needed) + * grr. I hate automake. temporarily disable NLS + + -- Rene Engelhard <[email protected]> Sat, 27 Aug 2005 00:30:58 +0200 + +hunspell (1.0.8-3) experimental; urgency=low + + * add patch to build PIC versions of the libraries + * we don't ship unmuch, so don't ship unmunch.h + + -- Rene Engelhard <[email protected]> Mon, 8 Aug 2005 04:02:41 +0200 + +hunspell (1.0.8-2) experimental; urgency=low + + * don't install unmunch, conflicts with libmyspell-dev + + -- Rene Engelhard <[email protected]> Wed, 3 Aug 2005 22:29:49 +0200 + +hunspell (1.0.8-1) experimental; urgency=low + + * New upstream release + + -- Rene Engelhard <[email protected]> Tue, 2 Aug 2005 18:48:19 +0200 + +hunspell (1.0.7-1) experimental; urgency=low + + * Initial release. + + -- Rene Engelhard <[email protected]> Tue, 26 Jul 2005 12:11:52 +0200 + diff --cc debian/control index d1fba96,0000000..30f34a0 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,108 -1,0 +1,108 @@@ +Source: hunspell +Priority: optional +Maintainer: Debian OpenOffice Team <[email protected]> +Uploaders: Rene Engelhard <[email protected]>, Chris Halls <[email protected]> +Build-Depends: debhelper (>= 4.0.0), libreadline5-dev, libncurses5-dev, libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9 +Standards-Version: 3.6.2 +Section: text + +Package: libhunspell-dev +Section: libdevel +Architecture: any - Depends: ${shlibs:Depends}, libhunspell-1.1-0 (= ${binary:Version}) ++Depends: ${shlibs:Depends}, libhunspell1 (= ${binary:Version}) +Description: spell checker and morphological analyzer (development) + Hunspell is a spell checker and morphological analyzer library and program + designed for languages with rich morphology and complex word compounding or + character encoding. It is based on MySpell and features an Ispell-like + terminal interface using Curses library, an Ispell pipe interface and an + OpenOffice.org UNO module. + . + Main features: + - Unicode support (first 65535 Unicode character) + - morphological analysis (in custom item and arrangement style) + - Max. 65535 affix classes and twofold affix stripping (for agglutinative + languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) + - Support complex compoundings (for example, Hungarian and German) + - Support language specific algorithms (for example, handling Azeri + and Turkish dotted i, or German sharp s) + - Handling conditional affixes, circumfixes, fogemorphemes, + forbidden words, pseudoroots and homonyms. + . + This package contains the headers and the static library. + - Package: libhunspell-1.1-0 ++Package: libhunspell1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: openoffice.org-core (= 2.2.0~rc2-1) +Description: spell checker and morphological analyzer (shared library) + Hunspell is a spell checker and morphological analyzer library and program + designed for languages with rich morphology and complex word compounding or + character encoding. It is based on MySpell and features an Ispell-like + terminal interface using Curses library, an Ispell pipe interface and an + OpenOffice.org UNO module. + . + Main features: + - Unicode support (first 65535 Unicode character) + - morphological analysis (in custom item and arrangement style) + - Max. 65535 affix classes and twofold affix stripping (for agglutinative + languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) + - Support complex compoundings (for example, Hungarian and German) + - Support language specific algorithms (for example, handling Azeri + and Turkish dotted i, or German sharp s) + - Handling conditional affixes, circumfixes, fogemorphemes, + forbidden words, pseudoroots and homonyms. + . + This package contains the shared library. + +Package: hunspell +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, myspell-en-us | myspell-dictionary | hunspell-dictionary +Description: spell checker and morphological analyzer (program) + Hunspell is a spell checker and morphological analyzer library and program + designed for languages with rich morphology and complex word compounding or + character encoding. It is based on MySpell and features an Ispell-like + terminal interface using Curses library, an Ispell pipe interface and an + OpenOffice.org UNO module. + . + Main features: + - Unicode support (first 65535 Unicode character) + - morphological analysis (in custom item and arrangement style) + - Max. 65535 affix classes and twofold affix stripping (for agglutinative + languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) + - Support complex compoundings (for example, Hungarian and German) + - Support language specific algorithms (for example, handling Azeri + and Turkish dotted i, or German sharp s) + - Handling conditional affixes, circumfixes, fogemorphemes, + forbidden words, pseudoroots and homonyms. + . + This package contains the program with the Ispell-like terminal and pipe + interfaces. + +Package: hunspell-tools +Architecture: any +Depends: ${shlibs:Depends}, ${perl:Depends} +Conflicts: libmyspell-dev +Replaces: libmyspell-dev +Description: tools for hunspell + Hunspell is a spell checker and morphological analyzer library and program + designed for languages with rich morphology and complex word compounding or + character encoding. It is based on MySpell and features an Ispell-like + terminal interface using Curses library, an Ispell pipe interface and an + OpenOffice.org UNO module. + . + Main features: + - Unicode support (first 65535 Unicode character) + - morphological analysis (in custom item and arrangement style) + - Max. 65535 affix classes and twofold affix stripping (for agglutinative + languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) + - Support complex compoundings (for example, Hungarian and German) + - Support language specific algorithms (for example, handling Azeri + and Turkish dotted i, or German sharp s) + - Handling conditional affixes, circumfixes, fogemorphemes, + forbidden words, pseudoroots and homonyms. + . + This package contains a the munch/unmunch tools of hunspell and + ispellaff2myspell for converting ispell affix files for myspell/hunspell + format. + diff --cc debian/libhunspell1.install index 79bbe2f,0000000..79bbe2f mode 100644,000000..100644 --- a/debian/libhunspell1.install +++ b/debian/libhunspell1.install diff --cc debian/libhunspell1.shlibs index 0000000,0000000..21531ee new file mode 100644 --- /dev/null +++ b/debian/libhunspell1.shlibs @@@ -1,0 -1,0 +1,1 @@@ ++libhunspell 1 libhunspell1 diff --cc debian/patches/00list index 10798de,0000000..4bad459 mode 100644,000000..100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@@ -1,7 -1,0 +1,7 @@@ +02_usr_share_myspell_dicts +#04_signed_chars +05_attribute_packed +06_remove-XFAILED +14_aspell_conv - 15_encds_static ++15_hunspell_pc_no_version +99_build_stuff diff --cc debian/patches/15_hunspell_pc_no_version.dpatch index 0000000,0000000..052cfc6 new file mode 100644 --- /dev/null +++ b/debian/patches/15_hunspell_pc_no_version.dpatch @@@ -1,0 -1,0 +1,17 @@@ ++#! /bin/sh /usr/share/dpatch/dpatch-run ++## hunspell_pc_no_version.dpatch by Rene Engelhard <[email protected]> ++## ++## All lines beginning with `## DP:' are a description of the patch. ++## DP: No description. ++ ++@DPATCH@ ++diff -urNad hunspell-1.2.1~/hunspell.pc.in hunspell-1.2.1/hunspell.pc.in ++--- hunspell-1.2.1~/hunspell.pc.in 2007-04-06 10:05:34.000000000 +0200 +++++ hunspell-1.2.1/hunspell.pc.in 2007-11-01 20:31:12.000000000 +0100 ++@@ -6,5 +6,5 @@ ++ Name: hunspell ++ Description: Hunpell spellchecking library ++ Version: @VERSION@ ++-Libs: -L${libdir} -lhunspell-@HUNSPELL_VERSION_MAJOR@.@HUNSPELL_VERSION_MINOR@ +++Libs: -L${libdir} -lhunspell ++ Cflags: -I${includedir}/hunspell diff --cc debian/rules index 3cf0395,0000000..934aa05 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,98 -1,0 +1,98 @@@ +#!/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. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +config.status: patch-stamp configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ - --with-ui --with-readline ++ --with-ui --with-readline --with-experimental + +build: build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) + $(MAKE) check + pod2man debian/ispellaff2myspell \ + > debian/ispellaff2myspell.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + ./debian/rules unpatch + rm -f debian/ispellaff2myspell.1 + rm -f config.log + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + dh_install + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples src/tools/example.cxx + dh_install + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
