Don, I don’t know if you saw the bdic.patch I previously sent to the bug report, but there was one small typo in one of the paths. That attached patch fixes that.
-- Soren Stoutner so...@debian.org
diff --git a/debian/changelog b/debian/changelog index cbc0fae..3ffee31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scowl (2020.12.07-4) UNRELEASED; urgency=medium + + [ Soren Stoutner ] + * Standardize .bdic configuration. (Closes: #1017646) + + -- Don Armstrong <d...@debian.org> Wed, 16 Oct 2024 16:22:06 -0700 + scowl (2020.12.07-3) unstable; urgency=medium * Include hunspell .bdic files (for qtwebengine and others). (Closes: diff --git a/debian/control b/debian/control index 58aa8ac..07c8ab7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: text Priority: standard Standards-Version: 4.1.4 Build-Depends: debhelper (>= 12) -Build-Depends-Indep: dictionaries-common-dev, dos2unix, aspell, qtwebengine5-dev-tools, libqt5webengine-data +Build-Depends-Indep: dictionaries-common-dev, dos2unix, aspell, convert-bdic 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 diff --git a/debian/hunspell-en-au.install b/debian/hunspell-en-au.install index 00d9a6a..86b925c 100644 --- a/debian/hunspell-en-au.install +++ b/debian/hunspell-en-au.install @@ -1,4 +1,4 @@ ./speller/en_AU.aff usr/share/hunspell ./speller/en_AU.dic usr/share/hunspell -./speller/en_AU.bdic usr/share/hunspell +./speller/en_AU.bdic usr/share/hunspell-bdic diff --git a/debian/hunspell-en-au.links b/debian/hunspell-en-au.links deleted file mode 100644 index 80f3a6e..0000000 --- a/debian/hunspell-en-au.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hunspell/en_AU.bdic usr/share/qt5/qtwebengine_dictionaries/en_AU.bdic -usr/share/hunspell/en_AU.bdic usr/share/qt6/qtwebengine_dictionaries/en_AU.bdic diff --git a/debian/hunspell-en-ca.install b/debian/hunspell-en-ca.install index f645db0..0b36743 100644 --- a/debian/hunspell-en-ca.install +++ b/debian/hunspell-en-ca.install @@ -1,4 +1,4 @@ ./speller/en_CA.aff usr/share/hunspell ./speller/en_CA.dic usr/share/hunspell -./speller/en_CA.bdic usr/share/hunspell +./speller/en_CA.bdic usr/share/hunspell-bdic diff --git a/debian/hunspell-en-ca.links b/debian/hunspell-en-ca.links deleted file mode 100644 index be369a0..0000000 --- a/debian/hunspell-en-ca.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hunspell/en_CA.bdic usr/share/qt5/qtwebengine_dictionaries/en_CA.bdic -usr/share/hunspell/en_CA.bdic usr/share/qt6/qtwebengine_dictionaries/en_CA.bdic diff --git a/debian/hunspell-en-us.install b/debian/hunspell-en-us.install index b0b0a2c..5f4a2fd 100644 --- a/debian/hunspell-en-us.install +++ b/debian/hunspell-en-us.install @@ -1,4 +1,4 @@ ./speller/en_US.aff usr/share/hunspell ./speller/en_US.dic usr/share/hunspell -./speller/en_US.bdic usr/share/hunspell +./speller/en_US.bdic usr/share/hunspell-bdic diff --git a/debian/hunspell-en-us.links b/debian/hunspell-en-us.links deleted file mode 100644 index 68e537e..0000000 --- a/debian/hunspell-en-us.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hunspell/en_US.bdic usr/share/qt5/qtwebengine_dictionaries/en_US.bdic -usr/share/hunspell/en_US.bdic usr/share/qt6/qtwebengine_dictionaries/en_US.bdic diff --git a/debian/rules b/debian/rules index 7f6ce0d..15482b9 100755 --- a/debian/rules +++ b/debian/rules @@ -61,10 +61,13 @@ override_dh_auto_build: cd speller && $(MAKE) hunspell ( cd speller; \ for a in *.dic; do \ - /usr/lib/qt5/bin/qwebengine_convert_dict $$a $${a%%.dic}.bdic; \ + /usr/bin/convert-bdic $$a $${a%%.dic}.bdic; \ done;) override_dh_auto_clean: + # Remove any complied .bdic binary dictionaries. + rm -rf speller/*.bdic + rm -rf final_utf8; set -e;\ for SIZE in $(SIZES); do\
signature.asc
Description: This is a digitally signed message part.
