This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository hunspell.
commit ca411f291282ce7434169302c198f249d35bec29 Merge: 708bfad c625fc3 Author: Rene Engelhard <[email protected]> Date: Tue Mar 20 13:21:54 2007 +0100 Imported Debian patch 1.1.5-1 ChangeLog | 117 +- Makefile.am | 5 +- Makefile.in | 149 +- NEWS | 21 + README | 15 +- config.guess | 409 +- config.h.in | 6 + config.sub | 262 +- configure | 23146 +++++++++++++++---- configure.ac | 28 +- debian/changelog | 9 + debian/libhunspell-1.1-0.shlibs | 2 +- debian/patches/00list | 7 +- debian/patches/03_tests_LANG_C.dpatch | 18 - debian/patches/09_shared_libs.dpatch | 88 - debian/patches/10_pkg-config.dpatch | 56 - debian/patches/11_tools_headers.dpatch | 213 + debian/patches/12_get_csconv.dpatch | 37 + debian/rules | 5 +- depcomp | 75 +- hunspell.pc.in | 10 + install-sh | 476 +- m4/Makefile.in | 64 +- man/Makefile.in | 93 +- man/hu/Makefile.in | 66 +- man/hunspell.4 | 3 + missing | 54 +- mkinstalldirs | 69 +- src/Makefile.am | 2 +- src/Makefile.in | 89 +- src/hunspell/Makefile.am | 15 +- src/hunspell/Makefile.in | 225 +- src/hunspell/affentry.cxx | 301 +- src/hunspell/affentry.hxx | 9 +- src/hunspell/affixmgr.cxx | 1748 +- src/hunspell/affixmgr.hxx | 43 +- src/hunspell/atypes.hxx | 30 +- src/hunspell/baseaffix.hxx | 10 +- src/hunspell/csutil.cxx | 452 +- src/hunspell/csutil.hxx | 30 +- src/hunspell/dictmgr.cxx | 22 +- src/hunspell/hashmgr.cxx | 228 +- src/hunspell/hashmgr.hxx | 12 +- src/hunspell/htypes.hxx | 3 + src/hunspell/hunspell.cxx | 743 +- src/hunspell/hunspell.h | 33 + src/hunspell/hunspell.hxx | 58 +- src/hunspell/langnum.hxx | 1 + src/hunspell/license.hunspell | 2 + src/hunspell/makefile.mk | 1 + src/hunspell/suggestmgr.cxx | 1069 +- src/hunspell/suggestmgr.hxx | 22 +- src/hunspell/utf_info.cxx | 2 +- src/parsers/Makefile.am | 9 +- src/parsers/Makefile.in | 145 +- src/parsers/htmlparser.cxx | 4 +- src/parsers/htmlparser.hxx | 2 +- src/parsers/latexparser.cxx | 4 +- src/parsers/latexparser.hxx | 2 +- src/parsers/manparser.cxx | 4 +- src/parsers/manparser.hxx | 2 +- src/parsers/textparser.cxx | 10 +- src/parsers/textparser.hxx | 5 +- src/tools/Makefile.am | 20 +- src/tools/Makefile.in | 176 +- src/tools/hunspell.cxx | 95 +- src/tools/hunstem.cxx | 25 +- src/tools/munch.c | 2 +- src/tools/munch.h | 121 - src/tools/unmunch.c | 6 +- src/tools/unmunch.h | 76 - src/win_api/Makefile.am | 1 + {m4 => src/win_api}/Makefile.in | 80 +- src/win_api/README | 4 + src/win_api/hunspelldll.c | 110 + src/win_api/hunspelldll.dev | 79 + .../license.hunspell => win_api/hunspelldll.h} | 123 +- tests/1592880.aff | 18 + tests/1592880.dic | 4 + tests/1592880.good | 3 + tests/1592880.test | 4 + tests/Makefile.am | 46 +- tests/Makefile.in | 111 +- tests/i35725.aff | 4 + tests/ignore.aff | 5 + tests/ignore.dic | 3 + tests/ignore.good | 6 + tests/ignore.test | 4 + tests/ignoreutf.aff | 6 + tests/ignoreutf.dic | 10 + tests/ignoreutf.good | 9 + tests/ignoreutf.test | 4 + tests/sug.aff | 11 + tests/sug.dic | 7 + tests/sug.sug | 6 + tests/sug.test | 4 + tests/sug.wrong | 6 + tests/test.sh | 3 +- tests/utf8_bom.aff | 3 + tests/utf8_bom.dic | 2 + tests/utf8_bom.good | 2 + tests/utf8_bom.test | 4 + tests/utf8_bom2.aff | 3 + tests/utf8_bom2.dic | 2 + tests/utf8_bom2.good | 2 + tests/utf8_bom2.test | 4 + tests/utf8_nonbmp.aff | 1 + tests/utf8_nonbmp.dic | 5 + tests/utf8_nonbmp.good | 5 + tests/utf8_nonbmp.test | 4 + tests/utf8_nonbmp.wrong | 2 + 111 files changed, 24164 insertions(+), 7907 deletions(-) diff --cc debian/changelog index 555244c,0000000..e37c601 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,131 -1,0 +1,140 @@@ ++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/libhunspell-1.1-0.shlibs index 897e300,0000000..ee69870 mode 100644,000000..100644 --- a/debian/libhunspell-1.1-0.shlibs +++ b/debian/libhunspell-1.1-0.shlibs @@@ -1,1 -1,0 +1,1 @@@ - libhunspell-1.1 0 libhunspell-1.1-0 ++libhunspell-1.1 0 libhunspell-1.1-0 (>= 1.1.5-1) diff --cc debian/patches/00list index 3e6175a,0000000..bfb5256 mode 100644,000000..100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@@ -1,9 -1,0 +1,8 @@@ +02_usr_share_myspell_dicts - 03_tests_LANG_C - 04_signed_chars ++#04_signed_chars +05_attribute_packed +06_remove-XFAILED +08_tail - 09_shared_libs - 10_pkg-config ++11_tools_headers ++12_get_csconv +99_build_stuff diff --cc debian/patches/11_tools_headers.dpatch index 0000000,0000000..153c199 new file mode 100644 --- /dev/null +++ b/debian/patches/11_tools_headers.dpatch @@@ -1,0 -1,0 +1,213 @@@ ++#! /bin/sh /usr/share/dpatch/dpatch-run ++## 11_tools_headers.dpatch by <[email protected]> ++## ++## All lines beginning with `## DP:' are a description of the patch. ++## DP: the tar.gz doesn't contain them but munch/unmunch builds needs them. taken from ++## DP: the 1.1.4 tarball ++ ++@DPATCH@ ++diff -urNad hunspell-1.1.5~/src/tools/munch.h hunspell-1.1.5/src/tools/munch.h ++--- hunspell-1.1.5~/src/tools/munch.h 1970-01-01 01:00:00.000000000 +0100 +++++ hunspell-1.1.5/src/tools/munch.h 2007-03-20 12:00:48.000000000 +0100 ++@@ -0,0 +1,121 @@ +++/* munch header file */ +++ +++#define MAX_LN_LEN 200 +++#define MAX_WD_LEN 200 +++#define MAX_PREFIXES 256 +++#define MAX_SUFFIXES 256 +++#define MAX_ROOTS 20 +++#define MAX_WORDS 5000 +++ +++#define ROTATE_LEN 5 +++ +++#define ROTATE(v,q) \ +++ (v) = ((v) << (q)) | (((v) >> (32 - q)) & ((1 << (q))-1)); +++ +++#define SET_SIZE 256 +++ +++#define XPRODUCT (1 << 0) +++ +++/* the affix table entry */ +++ +++struct affent +++{ +++ char * appnd; +++ char * strip; +++ short appndl; +++ short stripl; +++ char achar; +++ char xpflg; +++ short numconds; +++ char conds[SET_SIZE]; +++}; +++ +++ +++struct affixptr +++{ +++ struct affent * aep; +++ int num; +++}; +++ +++/* the prefix and suffix table */ +++int numpfx; /* Number of prefixes in table */ +++int numsfx; /* Number of suffixes in table */ +++ +++/* the prefix table */ +++struct affixptr ptable[MAX_PREFIXES]; +++ +++/* the suffix table */ +++struct affixptr stable[MAX_SUFFIXES]; +++ +++ +++/* data structure to store results of lookups */ +++struct matches +++{ +++ struct hentry * hashent; /* hash table entry */ +++ struct affent * prefix; /* Prefix used, or NULL */ +++ struct affent * suffix; /* Suffix used, or NULL */ +++}; +++ +++int numroots; /* number of root words found */ +++struct matches roots[MAX_ROOTS]; /* list of root words found */ +++ +++/* hashing stuff */ +++ +++struct hentry +++{ +++ char * word; +++ char * affstr; +++ struct hentry * next; +++ int keep; +++}; +++ +++ +++int tablesize; +++struct hentry * tableptr; +++ +++/* unmunch stuff */ +++ +++int numwords; /* number of words found */ +++struct dwords +++{ +++ char * word; +++ int pallow; +++}; +++ +++struct dwords wlist[MAX_WORDS]; /* list words found */ +++ +++ +++/* the routines */ +++ +++int parse_aff_file(FILE* afflst); +++ +++void encodeit(struct affent * ptr, char * cs); +++ +++int load_tables(FILE * wrdlst); +++ +++int hash(const char *); +++ +++int add_word(char *); +++ +++struct hentry * lookup(const char *); +++ +++void aff_chk (const char * word, int len); +++ +++void pfx_chk (const char * word, int len, struct affent* ep, int num); +++ +++void suf_chk (const char * word, int len, struct affent * ep, int num, +++ struct affent * pfxent, int cpflag); +++ +++void add_affix_char(struct hentry * hent, char ac); +++ +++int expand_rootword(const char *, int, const char*, int); +++ +++void pfx_add (const char * word, int len, struct affent* ep, int num); +++ +++void suf_add (const char * word, int len, struct affent * ep, int num); +++ +++char * mystrsep(char ** stringp, const char delim); +++ +++char * mystrdup(const char * s); +++ +++void mychomp(char * s); ++diff -urNad hunspell-1.1.5~/src/tools/unmunch.h hunspell-1.1.5/src/tools/unmunch.h ++--- hunspell-1.1.5~/src/tools/unmunch.h 1970-01-01 01:00:00.000000000 +0100 +++++ hunspell-1.1.5/src/tools/unmunch.h 2007-03-20 12:00:48.000000000 +0100 ++@@ -0,0 +1,76 @@ +++/* unmunch header file */ +++ +++#define MAX_LN_LEN 200 +++#define MAX_WD_LEN 200 +++#define MAX_PREFIXES 256 +++#define MAX_SUFFIXES 256 +++#define MAX_WORDS 5000 +++ +++#define ROTATE_LEN 5 +++ +++#define ROTATE(v,q) \ +++ (v) = ((v) << (q)) | (((v) >> (32 - q)) & ((1 << (q))-1)); +++ +++#define SET_SIZE 256 +++ +++#define XPRODUCT (1 << 0) +++ +++/* the affix table entry */ +++ +++struct affent +++{ +++ char * appnd; +++ char * strip; +++ short appndl; +++ short stripl; +++ char achar; +++ char xpflg; +++ short numconds; +++ char conds[SET_SIZE]; +++}; +++ +++ +++struct affixptr +++{ +++ struct affent * aep; +++ int num; +++}; +++ +++/* the prefix and suffix table */ +++int numpfx; /* Number of prefixes in table */ +++int numsfx; /* Number of suffixes in table */ +++ +++/* the prefix table */ +++struct affixptr ptable[MAX_PREFIXES]; +++ +++/* the suffix table */ +++struct affixptr stable[MAX_SUFFIXES]; +++ +++ +++int numwords; /* number of words found */ +++struct dwords +++{ +++ char * word; +++ int pallow; +++}; +++ +++struct dwords wlist[MAX_WORDS]; /* list words found */ +++ +++ +++/* the routines */ +++ +++int parse_aff_file(FILE* afflst); +++ +++void encodeit(struct affent * ptr, char * cs); +++ +++int expand_rootword(const char *, int, const char*, int); +++ +++void pfx_add (const char * word, int len, struct affent* ep, int num); +++ +++void suf_add (const char * word, int len, struct affent * ep, int num); +++ +++char * mystrsep(char ** stringp, const char delim); +++ +++char * mystrdup(const char * s); +++ +++void mychomp(char * s); diff --cc debian/patches/12_get_csconv.dpatch index 0000000,0000000..629d687 new file mode 100644 --- /dev/null +++ b/debian/patches/12_get_csconv.dpatch @@@ -1,0 -1,0 +1,37 @@@ ++#! /bin/sh /usr/share/dpatch/dpatch-run ++## 12_get_csconv.dpatch by <[email protected]> ++## ++## All lines beginning with `## DP:' are a description of the patch. ++## DP: No description. ++ ++@DPATCH@ ++diff -urNad hunspell-1.1.5~/src/hunspell/hunspell.cxx hunspell-1.1.5/src/hunspell/hunspell.cxx ++--- hunspell-1.1.5~/src/hunspell/hunspell.cxx 2007-03-14 10:57:31.000000000 +0100 +++++ hunspell-1.1.5/src/hunspell/hunspell.cxx 2007-03-20 12:26:08.000000000 +0100 ++@@ -1224,13 +1224,12 @@ ++ return pAMgr->get_version(); ++ } ++ ++-/* ++- ++ struct cs_info * Hunspell::get_csconv() ++ { ++ return csconv; ++ } ++ +++/* ++ int utf16_isalpha(unsigned short c) { ++ return unicodeisalpha(c); ++ } ++diff -urNad hunspell-1.1.5~/src/hunspell/hunspell.hxx hunspell-1.1.5/src/hunspell/hunspell.hxx ++--- hunspell-1.1.5~/src/hunspell/hunspell.hxx 2007-03-12 02:46:10.000000000 +0100 +++++ hunspell-1.1.5/src/hunspell/hunspell.hxx 2007-03-20 12:26:19.000000000 +0100 ++@@ -92,7 +92,7 @@ ++ const char * get_wordchars(); ++ unsigned short * get_wordchars_utf16(int * len); ++ ++-// struct cs_info * get_csconv(); +++ struct cs_info * get_csconv(); ++ // int utf16_isalpha(unsigned short c); ++ const char * get_version(); ++ diff --cc debian/rules index 4cfaf88,0000000..9e466db mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,94 -1,0 +1,93 @@@ +#!/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 - ++ 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 --without-experimental + +build: build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) + $(MAKE) check + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + -$(MAKE) distclean + ./debian/rules unpatch + + 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 + dh_install + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + 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
