[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[hunspell] 65/98: Imported Debian patch 1.2.8-1



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository hunspell.

commit ada8e99aca5ed7ce25d6c8ddf05e5276b0da4139
Merge: 9555f6d fc2b5ba
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Nov 15 08:24:21 2008 +0100

    Imported Debian patch 1.2.8-1

 ChangeLog                            |   80 ++
 NEWS                                 |   33 +
 README                               |    1 +
 THANKS                               |    7 +
 aclocal.m4                           |  188 +++--
 config.guess                         |  640 +++++++-------
 config.sub                           |  202 ++---
 configure                            |  124 ++-
 configure.ac                         |    4 +-
 debian/changelog                     |    9 +
 debian/libhunspell-1.2-0.shlibs      |    2 +-
 debian/patches/00list                |    1 +
 debian/patches/14_aspell_conv.dpatch |    2 +-
 debian/patches/15_OOo_paths.dpatch   |    4 +-
 debian/patches/16_1.2.4-2.dpatch     |   48 ++
 debian/patches/99_build_stuff.dpatch |    2 +-
 depcomp                              |   60 +-
 install-sh                           |   19 +-
 ltmain.sh                            | 1523 +++++++++++-----------------------
 m4/Makefile.in                       |   78 +-
 man/Makefile.in                      |  135 +--
 man/hu/Makefile.in                   |   85 +-
 man/hunspell.4                       |   66 +-
 missing                              |   92 +-
 mkinstalldirs                        |   26 +-
 src/Makefile.in                      |  123 +--
 src/hunspell/Makefile.am             |    4 +-
 src/hunspell/Makefile.in             |  142 ++--
 src/hunspell/affentry.cxx            |   15 +-
 src/hunspell/affixmgr.cxx            |  402 +++++++--
 src/hunspell/affixmgr.hxx            |   13 +-
 src/hunspell/atypes.hxx              |    8 +
 src/hunspell/csutil.cxx              |   28 +-
 src/hunspell/filemgr.cxx             |   11 +-
 src/hunspell/hunspell.cxx            |  345 ++++----
 src/hunspell/replist.cxx             |   95 +++
 src/hunspell/replist.hxx             |   24 +
 src/hunspell/w_char.hxx              |    2 +-
 src/tools/Makefile.am                |    2 +-
 src/tools/Makefile.in                |    2 +-
 src/tools/affixcompress              |   10 +-
 src/tools/hunspell.cxx               |    2 +
 src/tools/wordforms                  |   35 +
 src/win_api/Hunspell.rc              |    8 +-
 src/win_api/config.h                 |    6 +-
 tests/Makefile.am                    |   47 +-
 tests/Makefile.in                    |   47 +-
 tests/break.wrong                    |    2 +
 tests/breakdefault.aff               |    6 +
 tests/breakdefault.dic               |    6 +
 tests/breakdefault.good              |    7 +
 tests/breakdefault.sug               |    3 +
 tests/breakdefault.test              |    4 +
 tests/breakdefault.wrong             |    3 +
 tests/checkcompoundpattern2.aff      |    7 +
 tests/checkcompoundpattern2.dic      |    3 +
 tests/checkcompoundpattern2.good     |    3 +
 tests/checkcompoundpattern2.test     |    4 +
 tests/checkcompoundpattern2.wrong    |    1 +
 tests/checkcompoundpattern3.aff      |    6 +
 tests/checkcompoundpattern3.dic      |    5 +
 tests/checkcompoundpattern3.good     |    9 +
 tests/checkcompoundpattern3.test     |    4 +
 tests/checkcompoundpattern3.wrong    |    8 +
 tests/checkcompoundpattern4.aff      |    8 +
 tests/checkcompoundpattern4.dic      |    6 +
 tests/checkcompoundpattern4.good     |    2 +
 tests/checkcompoundpattern4.test     |    4 +
 tests/checkcompoundpattern4.wrong    |    2 +
 tests/condition.aff                  |    9 +-
 tests/condition.wrong                |    4 +
 tests/condition_utf.aff              |    8 +-
 tests/condition_utf.wrong            |    4 +
 tests/iconv.aff                      |   10 +
 tests/iconv.dic                      |    5 +
 tests/iconv.good                     |    6 +
 tests/iconv.test                     |    4 +
 tests/oconv.aff                      |   12 +
 tests/oconv.dic                      |    4 +
 tests/oconv.good                     |    2 +
 tests/oconv.sug                      |    3 +
 tests/oconv.test                     |    4 +
 tests/oconv.wrong                    |    3 +
 tests/simplifiedtriple.aff           |    8 +
 tests/simplifiedtriple.dic           |    3 +
 tests/simplifiedtriple.good          |    3 +
 tests/simplifiedtriple.test          |    4 +
 tests/simplifiedtriple.wrong         |    1 +
 88 files changed, 2664 insertions(+), 2338 deletions(-)

diff --cc debian/changelog
index b0165a4,0000000..ac0c949
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,312 -1,0 +1,321 @@@
++hunspell (1.2.8-1) experimental; urgency=low
++
++  * New upstream release (closes: #505634)
++  * update 15_OOo_paths.diff for OOo 3s new userdir
++  * put GCC compiler warnings fix into a patch proper. dpatch got removed
++    during 1.2.4->1.2.5 and it ended up in the .diff.gz
++
++ -- Rene Engelhard <rene@debian.org>  Sat, 15 Nov 2008 08:24:21 +0100
++
 +hunspell (1.2.7-2) experimental; urgency=low
 +
 +  * move h{,un}zip.1 to hunspell-tools and hunspell.{3,4} to libhunspell-dev -
 +    thanks Changwoo Ryu (closes: #504582)
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 10 Nov 2008 01:37:34 +0100
 +
 +hunspell (1.2.7-1) experimental; urgency=low
 +
 +  * New upstream release
 +    (with bumped shlibs, so upload to experimental)
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 26 Aug 2008 05:36:32 +0200
 +
 +hunspell (1.2.6-1) unstable; urgency=medium
 +
 +  * New upstream release
 +    - again with affix rule fixes (for sk_SK)
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 16 Jul 2008 16:11:31 +0200
 +
 +hunspell (1.2.5-1) unstable; urgency=high
 +
 +  * New upstream release
 +    - fixes affix rule matching algorithm with (at least) the en_GB
 +      dictionary (closes: #487874)
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 09 Jul 2008 20:48:33 +0200
 +
 +hunspell (1.2.4-2) unstable; urgency=low
 +
 +  * add gcc compiler fixes from upstreams 2.4.1-2 release.
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 19 Jun 2008 02:46:39 +0200
 +
 +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 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 5687033,0000000..13dcd43
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 (>= 1.2.7)
++libhunspell-1.2	0	libhunspell-1.2-0 (>= 1.2.8)
diff --cc debian/patches/00list
index f87d375,0000000..a94d56f
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,3 -1,0 +1,4 @@@
 +14_aspell_conv
 +15_OOo_paths
++16_1.2.4-2
 +99_build_stuff
diff --cc debian/patches/14_aspell_conv.dpatch
index 56fada8,0000000..3bb1312
mode 100644,000000..100644
--- a/debian/patches/14_aspell_conv.dpatch
+++ b/debian/patches/14_aspell_conv.dpatch
@@@ -1,49 -1,0 +1,49 @@@
 +#! /bin/sh /usr/share/dpatch/dpatch-run
 +## 14_aspell_conv.dpatch by  <rene@debian.org>
 +##
 +## All lines beginning with `## DP:' are a description of the patch.
- ## DP: No description.
++## DP: add info on how to convert aspell dicts to hunspell
 +
 +@DPATCH@
 +diff -urNad hunspell-1.1.5~/man/hunspell.4 hunspell-1.1.5/man/hunspell.4
 +--- hunspell-1.1.5~/man/hunspell.4	2007-03-14 14:37:31.000000000 +0100
 ++++ hunspell-1.1.5/man/hunspell.4	2007-04-11 14:36:27.000000000 +0200
 +@@ -1023,6 +1023,38 @@
 + Hunspell has supported only the first 65536 characters (Basic Multilingual Plane)
 + of Unicode Standard, yet.
 + 
 ++.SH "Conversion of aspell dictionaries"
 ++Aspell dictionaries can be easily converted into hunspell. Conversion steps:
 ++
 ++\fBdictionary (xx.cwl -> xx.wl):\fR
 ++
 ++.nf
 ++preunzip xx.cwl
 ++wc -l < xx.wl > xx.dic
 ++cat xx.wl >> xx.dic
 ++.fi
 ++
 ++\fBaffix file\fR
 ++
 ++If the affix file exists, copy it:
 ++.nf
 ++cp xx_affix.dat xx.aff
 ++.fi
 ++If not, create it with the suitable character encoding (see xx.dat)
 ++.nf
 ++echo "SET ISO8859-x" > xx.aff
 ++.fi
 ++or
 ++.nf
 ++echo "SET UTF-8" > xx.aff
 ++.fi
 ++
 ++It's useful to add a TRY option with the characters of the dictionary with
 ++frequency order to set edit distance suggestions:
 ++.nf
 ++echo "TRY qwertzuiopasdfghjklyxcvbnmQWERTZUIOPASDFGHJKLYXCVBNM" >>xx.aff
 ++.fi
 ++
 + .SH "SEE ALSO"
 + .B hunspell (1),
 + .B ispell (1),
diff --cc debian/patches/15_OOo_paths.dpatch
index 8a90452,0000000..9c9372e
mode 100644,000000..100644
--- a/debian/patches/15_OOo_paths.dpatch
+++ b/debian/patches/15_OOo_paths.dpatch
@@@ -1,23 -1,0 +1,23 @@@
 +#! /bin/sh /usr/share/dpatch/dpatch-run
 +## 15_OOo_paths.dpatch by Rene Engelhard <rene@debian.org>
 +##
 +## All lines beginning with `## DP:' are a description of the patch.
- ## DP: No description.
++## DP: OOo pathsNo description.
 +
 +@DPATCH@
 +diff -urNad hunspell-1.2.6~/src/tools/hunspell.cxx hunspell-1.2.6/src/tools/hunspell.cxx
 +--- hunspell-1.2.6~/src/tools/hunspell.cxx	2008-07-16 16:14:13.000000000 +0200
 ++++ hunspell-1.2.6/src/tools/hunspell.cxx	2008-07-16 16:18:13.000000000 +0200
 +@@ -67,9 +67,12 @@
 +     "/usr/share/myspell:" \
 +     "/usr/share/myspell/dicts"
 + #define USEROOODIR \
- +    ".openoffice.org3/user/wordbook:" \
+++    ".openoffice.org/3/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:" \
diff --cc debian/patches/16_1.2.4-2.dpatch
index 0000000,0000000..b82cd20
new file mode 100644
--- /dev/null
+++ b/debian/patches/16_1.2.4-2.dpatch
@@@ -1,0 -1,0 +1,48 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 16_2.4.1-2.dpatch by  <rene@frodo>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: get 1.2.4-2 changes. ChangeLog says (not patched here):
++## DP 2008-06-18 Németh László <nemeth at OOo>:
++## DP         * src/hunspell/affixmgr.cxx: fix GCC compiler warnings
++## DP           (comparisons with string literal results in unspecified behaviour).
++## DP           The problem reported by Ladislav Michnovič.
++
++@DPATCH@
++--- hunspell-1.2.6.orig/src/hunspell/affixmgr.cxx
+++++ hunspell-1.2.6/src/hunspell/affixmgr.cxx
++@@ -148,11 +148,11 @@
++        sStart[j] = NULL;
++   }
++ 
++-  if (keystring) free(keystring);
+++  if (keystring && keystring != SPELL_KEYSTRING) free(keystring);
++   keystring=NULL;
++   if (trystring) free(trystring);
++   trystring=NULL;
++-  if (encoding) free(encoding);
+++  if (encoding && encoding != SPELL_ENCODING) free(encoding);
++   encoding=NULL;
++   if (maptable) {  
++      for (int j=0; j < nummap; j++) {
++@@ -2971,7 +2971,9 @@
++ // return text encoding of dictionary
++ char * AffixMgr::get_encoding()
++ {
++-  if (! encoding ) encoding = mystrdup(SPELL_ENCODING);
+++  if (! encoding ) {
+++      encoding = SPELL_ENCODING;
+++  }
++   return mystrdup(encoding);
++ }
++ 
++@@ -3020,7 +3022,7 @@
++ // return the keyboard string for suggestions
++ char * AffixMgr::get_key_string()
++ {
++-  if (! keystring ) keystring = mystrdup(SPELL_KEYSTRING);
+++  if (! keystring ) keystring = SPELL_KEYSTRING;
++   return mystrdup(keystring);
++ }
++ 
++
diff --cc debian/patches/99_build_stuff.dpatch
index f31014d,0000000..e265b03
mode 100644,000000..100644
--- a/debian/patches/99_build_stuff.dpatch
+++ b/debian/patches/99_build_stuff.dpatch
@@@ -1,40 -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.
++## DP: build stuff
 +
 +case "$1" in
 +	-patch)
 +		for i in configure config.guess config.sub \
 +			INSTALL depcomp install-sh missing \
 +			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 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: