tag 879199 + patch
thanks
Hi again,
On Fri, Oct 20, 2017 at 12:50:00PM +0200, Rene Engelhard wrote:
> Will send a patch as a follow-up.
Here it is.
hunspell-en-{au,ca} need an epoch to be bigger than what
libreoffice-dictionaries built.
I can upload if you are busy and don't have time.
After that I would request removal of the hunspell-en-us source package and
remove hunspell-en-{au,ca} from libreoffice-dictionaries.
Regards,
Rene
diff -Nru scowl-2017.01.22/debian/changelog scowl-2017.01.22/debian/changelog
--- scowl-2017.01.22/debian/changelog 2017-04-09 22:25:00.000000000 +0000
+++ scowl-2017.01.22/debian/changelog 2017-10-20 11:11:13.000000000 +0000
@@ -1,3 +1,11 @@
+scowl (2017.01.22-2) unstable; urgency=medium
+
+ * build hunspell-en-{us,au,ca} from here. The versions in
+ libreoffice-dictionaries are built from here anyway
+ (closes: #795159, #874519, #879199)
+
+ -- Rene Engelhard <[email protected]> Fri, 20 Oct 2017 11:11:13 +0000
+
scowl (2017.01.22-1) experimental; urgency=low
* New upstream release
diff -Nru scowl-2017.01.22/debian/control scowl-2017.01.22/debian/control
--- scowl-2017.01.22/debian/control 2017-04-06 15:02:11.000000000 +0000
+++ scowl-2017.01.22/debian/control 2017-10-20 11:10:15.000000000 +0000
@@ -4,7 +4,7 @@
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/
Package: scowl
@@ -280,3 +280,45 @@
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 -Nru scowl-2017.01.22/debian/hunspell-en-au.install scowl-2017.01.22/debian/hunspell-en-au.install
--- scowl-2017.01.22/debian/hunspell-en-au.install 1970-01-01 00:00:00.000000000 +0000
+++ scowl-2017.01.22/debian/hunspell-en-au.install 2017-10-20 08:03:38.000000000 +0000
@@ -0,0 +1,3 @@
+./speller/en_AU.aff usr/share/hunspell
+./speller/en_AU.dic usr/share/hunspell
+
diff -Nru scowl-2017.01.22/debian/hunspell-en-ca.install scowl-2017.01.22/debian/hunspell-en-ca.install
--- scowl-2017.01.22/debian/hunspell-en-ca.install 1970-01-01 00:00:00.000000000 +0000
+++ scowl-2017.01.22/debian/hunspell-en-ca.install 2017-10-20 08:04:01.000000000 +0000
@@ -0,0 +1,3 @@
+./speller/en_CA.aff usr/share/hunspell
+./speller/en_CA.dic usr/share/hunspell
+
diff -Nru scowl-2017.01.22/debian/hunspell-en-us.install scowl-2017.01.22/debian/hunspell-en-us.install
--- scowl-2017.01.22/debian/hunspell-en-us.install 1970-01-01 00:00:00.000000000 +0000
+++ scowl-2017.01.22/debian/hunspell-en-us.install 2017-10-20 08:03:13.000000000 +0000
@@ -0,0 +1,3 @@
+./speller/en_US.aff usr/share/hunspell
+./speller/en_US.dic usr/share/hunspell
+
diff -Nru scowl-2017.01.22/debian/patches/no-zips.diff scowl-2017.01.22/debian/patches/no-zips.diff
--- scowl-2017.01.22/debian/patches/no-zips.diff 1970-01-01 00:00:00.000000000 +0000
+++ scowl-2017.01.22/debian/patches/no-zips.diff 2017-10-20 11:05:11.000000000 +0000
@@ -0,0 +1,39 @@
+Description: avoid worldlist*zip and hunspell*zip for hunspell
+ Let's not create worldlist*zip and hunspell*zip for hunspell. We are not going
+ to distribute them or use them in any way. Saves us a zip build-depdency
+ but more importantly it does not create "binary" files in speller/hunspell
+ we would need to manually remove it clean.
+Author: Rene Engelhard <[email protected]>
+
+---
+Origin: vendor
+Forwarded: no
+Last-Update: 2017-10-20
+
+--- scowl-2017.01.22.orig/speller/make-hunspell-dict
++++ scowl-2017.01.22/speller/make-hunspell-dict
+@@ -56,12 +56,8 @@ doit() {
+ cat $3 >> README_$1.txt
+ fi
+
+- rm -f hunspell-$fn.zip
+- zip -9 hunspell-$fn.zip README_$1.txt $1.dic $1.aff
+-
+ if [ -z "$3" ]; then
+ mkdir -p hunspell
+- cp hunspell-$fn.zip hunspell/
+
+ #echo check
+
+@@ -70,11 +66,6 @@ doit() {
+ #hunspell -l -d ./$1 < $1.dic.tocheck > misspelled
+
+ cat $1.tocheck | iconv -f iso-8859-1 -t utf-8 | $UNIX2DOS > $1.txt
+- cat <<EOF > README.txt
+-This zip file contains the words found in the corresponding Hunspell
+-dictionary. See the file README_$1.txt.
+-EOF
+- zip -9 hunspell/wordlist-$fn.zip README.txt README_$1.txt $1.txt
+ fi
+ }
+
diff -Nru scowl-2017.01.22/debian/patches/series scowl-2017.01.22/debian/patches/series
--- scowl-2017.01.22/debian/patches/series 2017-04-09 22:19:06.000000000 +0000
+++ scowl-2017.01.22/debian/patches/series 2017-10-20 11:01:49.000000000 +0000
@@ -1 +1,2 @@
remove_mys
+no-zips.diff
diff -Nru scowl-2017.01.22/debian/rules scowl-2017.01.22/debian/rules
--- scowl-2017.01.22/debian/rules 2017-04-09 22:03:50.000000000 +0000
+++ scowl-2017.01.22/debian/rules 2017-10-20 11:07:45.000000000 +0000
@@ -35,6 +35,8 @@
CLASSES:=words proper-names upper contractions
VARIANTS:=0 1
+include /usr/share/dpkg/pkg-info.mk
+
%:
dh $@
@@ -95,7 +97,7 @@
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 @@
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 @@
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-au -Nhunspell-en-ca
+ dh_gencontrol -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 @@
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)))
