From b211c54779d230ad3596bed0bb284028c688fd56 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Sun, 29 Mar 2020 16:17:37 -0700 Subject: [PATCH] distribute all scowl files as utf-8 --- debian/NEWS | 8 ++++++++ debian/changelog | 1 + debian/rules | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..125396d --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,8 @@ +scowl (2019.10.06-1) unstable; urgency=medium + + * The scowl binary package now distributes all of its wordlists in UTF-8 + rather than iso8859-1. This is different than the upstream default of + iso8859-1. + + -- Don Armstrong Sun, 29 Mar 2020 16:12:29 -0700 + diff --git a/debian/changelog b/debian/changelog index ed138cc..4877384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ scowl (2019.10.06-1) unstable; urgency=medium * New upstream release (Closes: #952736) * Deprecate reprized for reprised (Closes: #952653) * Use up to 70 wordlists for hunspell (Closes: #933544) + * Distribute all scowl files as utf-8 (Closes: #775480) -- Don Armstrong Sat, 29 Feb 2020 20:07:46 -0800 diff --git a/debian/rules b/debian/rules index 3e0aa21..13ac6a9 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,11 @@ include /usr/share/dpkg/pkg-info.mk dh $@ override_dh_auto_build: + set -e; \ + mkdir -p final_utf8;\ + for file in final/*.[0-9][0-9]; do\ + iconv -f 'iso8859-1' -t 'utf-8' < $${file} > final_utf8/$$(basename $${file}); \ + done; set -e;\ for SPELLING in $(SPELLINGS); do\ for SIZE in $(SIZES); do\ @@ -100,6 +105,7 @@ override_dh_auto_build: cd speller && $(MAKE) hunspell override_dh_auto_clean: + rm -rf final_utf8; set -e;\ for SIZE in $(SIZES); do\ if [ -n "$$SIZE" ]; then SIZE="-$$SIZE"; fi; \ @@ -119,7 +125,7 @@ override_dh_auto_install: install-scowl install-hunspell $(INSTALL_WORDLISTS) install-scowl: dh_installdirs --package=scowl - dh_install --package=scowl final/*.[0-9][0-9] usr/share/dict/scowl + dh_install --package=scowl final_utf8/*.[0-9][0-9] usr/share/dict/scowl dh_installdocs --package=scowl README debian/README.Debian install-hunspell: -- 2.39.2