[hunspell] 55/98: Imported Debian patch 1.2.4-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit 0a8eeca84ec072e6fa3dd728b8b0c5b972b8470e
Merge: 8d8d603 e9fbff0
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 17 17:56:47 2008 +0200
Imported Debian patch 1.2.4-1
ChangeLog | 79 ++
NEWS | 15 +
THANKS | 13 +-
aclocal.m4 | 789 ++++-------
config.h.in | 6 +-
configure | 102 +-
configure.ac | 39 +-
debian/changelog | 11 +-
debian/libhunspell-1.2-0.shlibs | 2 +-
debian/patches/02_usr_share_myspell_dicts.dpatch | 14 +-
debian/patches/99_build_stuff.dpatch | 6 +-
hunspell.pc.in | 4 +-
ltmain.sh | 1523 +++++++---------------
man/Makefile.am | 2 +-
man/Makefile.in | 72 +-
man/hu/hunspell.1 | 1 +
man/hu/hunspell.4 | 2 +-
man/hunspell.1 | 19 +-
man/hunspell.3 | 218 ++++
man/hunzip.1 | 24 +
man/hzip.1 | 24 +
po/hu.gmo | Bin 8886 -> 8886 bytes
po/hu.po | 144 +-
po/hunspell.pot | 144 +-
src/hunspell/affentry.cxx | 45 +-
src/hunspell/affixmgr.cxx | 110 +-
src/hunspell/csutil.cxx | 42 +-
src/hunspell/csutil.hxx | 9 +
src/hunspell/hashmgr.cxx | 17 +-
src/hunspell/hunspell.cxx | 155 ++-
src/hunspell/hunspell.h | 4 +
src/hunspell/hunspell.hxx | 18 +-
src/hunspell/suggestmgr.cxx | 40 +-
src/tools/analyze.cxx | 14 +-
src/tools/chmorph.cxx | 12 +-
src/tools/example.cxx | 3 +-
src/tools/hunspell.cxx | 56 +-
src/win_api/Hunspell.rc | 8 +-
src/win_api/README | 2 +-
src/win_api/hunspelldll.c | 4 +
src/win_api/hunspelldll.h | 4 +-
tests/1975530.aff | 6 +
tests/1975530.dic | 3 +
tests/1975530.good | 3 +
tests/1975530.test | 4 +
tests/1975530.wrong | 1 +
tests/Makefile.am | 22 +-
tests/Makefile.in | 22 +-
tests/base.sug | 2 +-
tests/base_utf.sug | 2 +-
tests/condition.aff | 37 +
tests/condition.dic | 2 +
tests/condition.good | 18 +
tests/condition.test | 4 +
tests/condition.wrong | 15 +
tests/condition_utf.aff | 38 +
tests/condition_utf.dic | 2 +
tests/condition_utf.good | 19 +
tests/condition_utf.test | 4 +
tests/condition_utf.wrong | 14 +
60 files changed, 2036 insertions(+), 1978 deletions(-)
diff --cc debian/changelog
index a801b74,0000000..2f3cd68
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,268 -1,0 +1,277 @@@
++hunspell (1.2.4-1) unstable; urgency=medium
++
++ * New upstream release
++ * update 02_usr_share_myspell_dicts.dpatch to also allow /usr/share/myspell
++ as path. Update also for new .openoffice.org3 and OOo3 locations
++ * cleanup diff. actually make encds[] static (as in upstream), oops
++
++ -- Rene Engelhard <rene@debian.org> Tue, 17 Jun 2008 17:56:47 +0200
++
+hunspell (1.2.2-2) unstable; urgency=low
+
+ * add Recommends: on the dicts to libhunspell-1.2-0 (closes: #476809)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 22 Apr 2008 21:13:34 +0200
+
+hunspell (1.2.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Sat, 12 Apr 2008 15:45:16 +0200
+
+hunspell (1.2.2~b2~20080401-4) experimental; urgency=low
+
+ * actually add 15_encds_static to 00list...
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Apr 2008 00:32:12 +0200
+
+hunspell (1.2.2~b2~20080401-3) experimental; urgency=low
+
+ * merge 1.1.9-2
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Apr 2008 00:17:32 +0200
+
+hunspell (1.1.9-2) unstable; urgency=low
+
+ * make encds[] struct static, thanks Stefan Weil.
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Apr 2008 00:13:37 +0200
+
+hunspell (1.2.2~b2~20080401-2) experimental; urgency=low
+
+ * readd (updated) libhunspell-dev.links to have a
+ /usr/lib/libhunspell.so for packages not using pkg-config
+ but -lhunspell (icedove...)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Apr 2008 16:05:17 +0200
+
+hunspell (1.2.2~b2~20080401-1) experimental; urgency=low
+
+ * New upstream pre-release
+ * install analyze, chmorph and {h,hun}zip into hunspell-tools
+ (into /usr/lib/hunspell)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 02 Apr 2008 01:00:28 +0200
+
+hunspell (1.2.2~b-1) experimental; urgency=low
+
+ * New upstream (beta) release
+
+ -- Rene Engelhard <rene@debian.org> Mon, 21 Jan 2008 00:30:52 +0100
+
+hunspell (1.2.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Thu, 01 Nov 2007 20:35:20 +0100
+
+hunspell (1.1.9-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> Fri, 20 Jul 2007 15:54:07 +0200
+
+hunspell (1.1.8-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Jul 2007 09:49:04 +0200
+
+hunspell (1.1.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> Wed, 11 Apr 2007 16:11:04 +0200
+
+hunspell (1.1.5-4) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> Wed, 28 Mar 2007 16:29:52 +0200
+
+hunspell (1.1.5-2) experimental; urgency=low
+
+ * fix hunspell.hxx
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> Tue, 20 Mar 2007 13:21:54 +0100
+
+hunspell (1.1.4-8) experimental; urgency=low
+
+ * add pkg-config file
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> 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 <sesse@debian.org> 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)
++ Gerfried Fuchs (closes: #359628)
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> Fri, 11 Nov 2005 14:23:40 +0100
+
+hunspell (1.1.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Wed, 9 Nov 2005 18:24:48 +0100
+
+hunspell (1.1.0-2) unstable; urgency=low
+
+ * upload to unstable.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 20 Oct 2005 01:13:42 +0200
+
+hunspell (1.1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * run make check
+
+ -- Rene Engelhard <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> 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 <rene@debian.org> Wed, 3 Aug 2005 22:29:49 +0200
+
+hunspell (1.0.8-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 2 Aug 2005 18:48:19 +0200
+
+hunspell (1.0.7-1) experimental; urgency=low
+
+ * Initial release.
+
+ -- Rene Engelhard <rene@debian.org> Tue, 26 Jul 2005 12:11:52 +0200
+
diff --cc debian/libhunspell-1.2-0.shlibs
index 839bb9d,0000000..a89e3f9
mode 100644,000000..100644
--- a/debian/libhunspell-1.2-0.shlibs
+++ b/debian/libhunspell-1.2-0.shlibs
@@@ -1,1 -1,0 +1,1 @@@
- libhunspell-1.2 0 libhunspell-1.2-0
++libhunspell-1.2 0 libhunspell-1.2-0 (>= 1.2.4)
diff --cc debian/patches/02_usr_share_myspell_dicts.dpatch
index e561b5b,0000000..02bf7fc
mode 100644,000000..100644
--- a/debian/patches/02_usr_share_myspell_dicts.dpatch
+++ b/debian/patches/02_usr_share_myspell_dicts.dpatch
@@@ -1,25 -1,0 +1,27 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_usr_share_myspell_dicts.dpatch by Rene Engelhard <rene@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
- diff -urNad hunspell-1.2.2~/src/tools/hunspell.cxx hunspell-1.2.2/src/tools/hunspell.cxx
- --- hunspell-1.2.2~/src/tools/hunspell.cxx 2008-04-01 17:05:57.000000000 +0200
- +++ hunspell-1.2.2/src/tools/hunspell.cxx 2008-04-01 17:09:39.000000000 +0200
- @@ -64,11 +64,13 @@
++diff -urNad hunspell-1.2.4~/src/tools/hunspell.cxx hunspell-1.2.4/src/tools/hunspell.cxx
++--- hunspell-1.2.4~/src/tools/hunspell.cxx 2008-06-17 17:52:58.000000000 +0200
+++++ hunspell-1.2.4/src/tools/hunspell.cxx 2008-06-17 17:56:35.000000000 +0200
++@@ -64,11 +64,15 @@
+
+ #define LIBDIR \
+ "/usr/share/hunspell:" \
+- "/usr/share/myspell"
++ "/usr/share/myspell:" \
++ "/usr/share/myspell/dicts"
+ #define USEROOODIR \
+++ ".openoffice.org3/user/wordbook:" \
+ ".openoffice.org2/user/wordbook:" \
+ ".openoffice.org2.0/user/wordbook"
+ #define OOODIR \
+++ "/usr/lib/openoffice/basis3.0/share/dict/ooo:" \
++ "/usr/lib/openoffice/share/dict/ooo:" \
++ "/opt/openoffice.org/basis3.0/share/dict/ooo:" \
++ "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
+ "/opt/openoffice.org2.4/share/dict/ooo:" \
- "/usr/lib/openoffice.org2.4/share/dict/ooo:" \
- "/opt/openoffice.org2.3/share/dict/ooo:" \
diff --cc debian/patches/99_build_stuff.dpatch
index 23be92d,0000000..f31014d
mode 100644,000000..100644
--- a/debian/patches/99_build_stuff.dpatch
+++ b/debian/patches/99_build_stuff.dpatch
@@@ -1,38 -1,0 +1,40 @@@
+#!/bin/sh
+##! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-unnamed.dpatch by <rene@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+case "$1" in
+ -patch)
+ for i in configure config.guess config.sub \
+ INSTALL depcomp install-sh missing \
- mkinstalldirs; do
++ mkinstalldirs config.h.in ltmain.sh \
++ aclocal.m4; do
+ cp -a $i $i.bak.dpatch;
+ done
+ for i in `find . -name Makefile.in`; do
+ cp -a $i $i.bak.dpatch;
+ done
+ libtoolize --force --copy
+ aclocal-1.9 -I m4
+ cp -a /usr/share/misc/config.sub config.sub
+ cp -a /usr/share/misc/config.guess config.guess
+ autoconf
+ automake-1.9 --gnu --copy --force-missing --add-missing
+ rm -rf autom4te.cache
+ ;;
+ -unpatch)
+ for i in configure config.guess config.sub \
+ INSTALL depcomp install-sh missing \
- mkinstalldirs; do
++ mkinstalldirs config.h.in ltmain.sh \
++ aclocal.m4; do
+ mv $i.bak.dpatch $i;
+ done
+ for i in `find . -name Makefile.in`; do
+ mv $i.bak.dpatch $i;
+ done
+ ;;
+esac
+exit 0
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: