From: Don Armstrong Date: Fri, 20 Oct 2017 18:55:52 +0000 (-0700) Subject: Build hunspell-en-{us,au,ca} from scowl X-Git-Tag: debian/2017.08.24-1~5 X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fscowl.git;a=commitdiff_plain;h=ac4bd44e5e62039df4feb3b30fd0d6c68d21f1e7 Build hunspell-en-{us,au,ca} from scowl Thanks to Rene Engelhard for the patch --- diff --git a/debian/changelog b/debian/changelog index 8e40405..c139aa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ scowl (2017.01.22-2) unstable; urgency=medium Thanks to Josh Triplett. * variant_0 and variant_1 are now _1 and _2; update rules to properly include them (Closes: #867586). Thanks to 積丹尼 Dan Jacobson. + * build hunspell-en-{us,au,ca} from here. The versions in + libreoffice-dictionaries are built from here anyway (closes: #795159, + #874519, #879199). Thanks to Rene Engelhard for the patch. -- diff --git a/debian/control b/debian/control index 95d3d02..1d5b73c 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: text Priority: standard Standards-Version: 3.9.2 Build-Depends: debhelper -Build-Depends-Indep: dictionaries-common-dev +Build-Depends-Indep: dictionaries-common-dev, dos2unix, aspell Homepage: http://wordlist.sourceforge.net/ Vcs-Browser: https://git.donarmstrong.com/deb_pkgs/scowl.git Vcs-Git: https://git.donarmstrong.com/deb_pkgs/scowl.git @@ -282,3 +282,45 @@ Description: Canadian English dictionary words for /usr/share/dict There are also -small and standard versions of this word list, and there are wbritish* and wamerican* packages as well. +Package: hunspell-en-us +Architecture: all +Replaces: openoffice.org-spellcheck-en-us, myspell-en-us +Provides: hunspell-dictionary, hunspell-dictionary-en, hunspell-dictionary-en-us +Depends: dictionaries-common (>= 0.10) +Suggests: hunspell, openoffice.org-hunspell | openoffice.org-core (>= 2.0.2) +Conflicts: openoffice.org (<= 1.0.3-2), myspell-en-us, mozilla-browser (<< 1.8+1.1.1-2), iceape-browser (<< 1.1.1-2), firefox (<< 2.0.0.3-2), thunderbird (<< 2.0.0.1+dfsg-0), iceweasel (<< 2.0.0.3-2), icedove (<< 2.0.0.0-4), openoffice.org-core (<< 2.1~m190-1), libxul0d (= 1.8.0.11-3) +Description: English_american dictionary for hunspell + This is the English_american dictionary for use with the hunspell spellchecker + +Package: hunspell-en-au +Architecture: all +Multi-Arch: foreign +Depends: dictionaries-common, ${misc:Depends}, ${hunspell:Depends}, ${misc:Depends} +Suggests: hunspell, libreoffice-writer +Provides: hunspell-dictionary, hunspell-dictionary-en-au +Conflicts: myspell-en-au +Description: English (Australia) dictionary for hunspell + This is the English (Australia) dictionary for use with the hunspell + spellchecker. + . + 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 a + LibreOffice UNO module. + +Package: hunspell-en-ca +Architecture: all +Multi-Arch: foreign +Depends: dictionaries-common, ${misc:Depends}, ${hunspell:Depends} +Suggests: hunspell, libreoffice-writer +Provides: hunspell-dictionary, hunspell-dictionary-en-ca +Description: English (Canada) dictionary for hunspell + This is the English (Canada) dictionary for use with the hunspell + spellchecker. + . + 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 a + LibreOffice UNO module. diff --git a/debian/patches/series b/debian/patches/series index 1db1dad..2a1ddca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ remove_mys +no-zips.diff move_sangs_to_insane diff --git a/debian/rules b/debian/rules index c7d72df..a861e1a 100755 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,8 @@ SPELLINGS:= american british canadian CLASSES:=words proper-names upper contractions VARIANTS:=1 2 +include /usr/share/dpkg/pkg-info.mk + %: dh $@ @@ -95,7 +97,7 @@ build: cat $$SPELLING-english$$SIZE.unsorted | LC_ALL=C sort -u | iconv -f 'iso8859-1' -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\ done;\ done - + cd speller && $(MAKE) hunspell override_dh_auto_clean: set -e;\ @@ -105,6 +107,7 @@ override_dh_auto_clean: rm -f $$SPELLING-english$$SIZE.unsorted $$SPELLING-english$$SIZE $$SPELLING-english$$SIZE.5 w$$SPELLING$$SIZE.scowl-word-lists-used;\ done;\ done + cd speller && $(MAKE) clean INSTALL_WORDLISTS=$(patsubst %-"",%,$(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size)))) @@ -122,11 +125,18 @@ install-scowl: dh_install --package=scowl final/*.[0-9][0-9] usr/share/dict/scowl dh_installdocs --package=scowl README debian/README.Debian - +install-hunspell: + dh_install --package=hunspell-en-us + dh_install --package=hunspell-en-au + dh_install --package=hunspell-en-ca override_dh_auto_test: echo "doing nothing"; +override_dh_gencontrol: + dh_gencontrol -Nhunspell-en-us -Nhunspell-en-au -Nhunspell-en-ca + dh_gencontrol -phunspell-en-us -phunspell-en-au -phunspell-en-ca -- -v1:$(DEB_VERSION_UPSTREAM) + WORDLIST=$(shell echo $(*)|sed -re 's/^w([a-z]*)(-*[a-z]*)/\1-english\2/') $(INSTALL_WORDLISTS): install-%: install-scowl @@ -139,7 +149,6 @@ $(INSTALL_WORDLISTS): install-%: install-scowl sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template > $(WORDLIST).5 dh_installman --package=$(*) $(WORDLIST).5 - # this is the install-w$(SPELLING)-$(VARIANT) rule .PHONY: $(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size)))