--- hunspell-1.2.6/debian/changelog 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/changelog 2009-06-15 12:38:36.000000000 -0400 @@ -1,3 +1,55 @@ +hunspell (1.2.8-4ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #387366), remaining changes: + - 18_Spell_misspelled_correctly.dpatch + + -- Michael Terry Mon, 15 Jun 2009 11:53:40 -0400 + +hunspell (1.2.8-4) unstable; urgency=low + + * stop applying 99_build_stuff.dpatch. We don't need it right now + and libtoolizing makes the build not create libhunspell-1.2.a + anymore (closes: #531881) + * point to LGPL-2.1/GPL-2 in debian/copyright + + -- Rene Engelhard Thu, 04 Jun 2009 20:53:41 +0200 + +hunspell (1.2.8-3) unstable; urgency=low + + * merge from Ubuntu + + Correct dictionary dependencies to be on hunspell-en-us. (LP: #327821) + + -- Rene Engelhard Sun, 05 Apr 2009 21:31:32 +0200 + +hunspell (1.2.8-2) unstable; urgency=low + + * upload to unstable + + -- Rene Engelhard Fri, 13 Feb 2009 09:52:53 +0100 + +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 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 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 Tue, 26 Aug 2008 05:36:32 +0200 + hunspell (1.2.6-1ubuntu2) jaunty; urgency=low * Correct dictionary dependencies to be on hunspell-en-us. (LP: #327821) --- hunspell-1.2.6/debian/control 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/control 2009-06-15 12:38:36.000000000 -0400 @@ -1,6 +1,6 @@ Source: hunspell Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian OpenOffice Team Uploaders: Rene Engelhard , Chris Halls Build-Depends: debhelper (>= 4.0.0), libreadline5-dev, libncurses5-dev, libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9 @@ -11,6 +11,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, libhunspell-1.2-0 (= ${binary:Version}) +Replaces: hunspell (<< 1.2.7-2) 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 @@ -85,7 +86,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends} Conflicts: libmyspell-dev -Replaces: libmyspell-dev +Replaces: libmyspell-dev, hunspell (<< 1.2.7-2) 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 --- hunspell-1.2.6/debian/copyright 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/copyright 2009-06-15 12:38:36.000000000 -0400 @@ -7,8 +7,8 @@ License: -GPL/LGPL/MPL, on Debian systems you can find the full text of the LGPL in /usr/share/common-licenses/LGPL and the full -text of the GPL in /usr/share/common-licenses/GPL. +GPL/LGPL/MPL, on Debian systems you can find the full text of the LGPL in /usr/share/common-licenses/LGPL-2.1 and the full +text of the GPL in /usr/share/common-licenses/GPL-2. MPL: --- hunspell-1.2.6/debian/hunspell.install 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/hunspell.install 2009-06-15 12:38:36.000000000 -0400 @@ -1,2 +1,3 @@ debian/tmp/usr/bin/hunspell -debian/tmp/usr/share +debian/tmp/usr/share/man/man1/hunspell.1 +debian/tmp/usr/share/man/hu/man1/hunspell.1 --- hunspell-1.2.6/debian/hunspell-tools.install 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/hunspell-tools.install 2009-06-15 12:38:36.000000000 -0400 @@ -5,3 +5,5 @@ debian/tmp/usr/bin/hunzip usr/lib/hunspell debian/tmp/usr/bin/analyze usr/lib/hunspell debian/tmp/usr/bin/chmorph usr/lib/hunspell +debian/tmp/usr/share/man/man1/hzip.1 +debian/tmp/usr/share/man/man1/hunzip.1 --- hunspell-1.2.6/debian/libhunspell-1.2-0.shlibs 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/libhunspell-1.2-0.shlibs 2009-06-15 12:38:36.000000000 -0400 @@ -1 +1 @@ -libhunspell-1.2 0 libhunspell-1.2-0 (>= 1.2.4) +libhunspell-1.2 0 libhunspell-1.2-0 (>= 1.2.8) --- hunspell-1.2.6/debian/libhunspell-dev.install 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/libhunspell-dev.install 2009-06-15 12:38:36.000000000 -0400 @@ -2,3 +2,7 @@ debian/tmp/usr/lib/*.a debian/tmp/usr/include debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/man/man3/hunspell.3 +debian/tmp/usr/share/man/man4/hunspell.4 +debian/tmp/usr/share/man/hu/man4/hunspell.4 + --- hunspell-1.2.6/debian/patches/00list 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/patches/00list 2009-06-15 12:38:36.000000000 -0400 @@ -1,4 +1,5 @@ 14_aspell_conv 15_OOo_paths +16_1.2.4-2 18_Spell_misspelled_correctly -99_build_stuff +#99_build_stuff --- hunspell-1.2.6/debian/patches/14_aspell_conv.dpatch 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/patches/14_aspell_conv.dpatch 2009-06-15 12:38:36.000000000 -0400 @@ -2,7 +2,7 @@ ## 14_aspell_conv.dpatch by ## ## 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.2.6/debian/patches/15_OOo_paths.dpatch 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/patches/15_OOo_paths.dpatch 2009-06-15 12:38:36.000000000 -0400 @@ -2,7 +2,7 @@ ## 15_OOo_paths.dpatch by Rene Engelhard ## ## 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 @@ -12,7 +12,7 @@ "/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 \ --- hunspell-1.2.6/debian/patches/16_1.2.4-2.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ hunspell-1.2.8/debian/patches/16_1.2.4-2.dpatch 2009-06-15 12:38:36.000000000 -0400 @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 16_2.4.1-2.dpatch by +## +## 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ó : +## 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); + } + + --- hunspell-1.2.6/debian/patches/18_Spell_misspelled_correctly.dpatch 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/patches/18_Spell_misspelled_correctly.dpatch 2009-06-15 12:38:36.000000000 -0400 @@ -2,7 +2,13 @@ ## 18_Spell_misspelled_correctly.dpatch by Nathan Handler ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Fix a few ironic misspellings of 'mispelled' + +# Ubuntu: https://bugs.launchpad.net/bugs/134792 +# Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533203 +# Upstream: http://sourceforge.net/support/tracker.php?aid=2806689 +# Patch: http://sourceforge.net/tracker/download.php?group_id=143754&atid=756395&file_id=331078&aid=2806689 +# Description: Fix a few ironic misspellings of 'mispelled' @DPATCH@ --- hunspell-1.2.4~/src/hunspell/suggestmgr.cxx 2008-06-17 03:57:54.000000000 -0500 --- hunspell-1.2.6/debian/patches/99_build_stuff.dpatch 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/patches/99_build_stuff.dpatch 2009-06-15 12:38:36.000000000 -0400 @@ -3,7 +3,7 @@ ## 99-unnamed.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: build stuff case "$1" in -patch) --- hunspell-1.2.6/debian/rules 2009-06-15 12:38:36.000000000 -0400 +++ hunspell-1.2.8/debian/rules 2009-06-15 12:38:36.000000000 -0400 @@ -70,6 +70,7 @@ dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + dh_install binary-indep: build install