diff -Nru language-selector-0.183/data/pkg_depends language-selector-0.184/data/pkg_depends --- language-selector-0.183/data/pkg_depends 2017-10-30 22:41:54.000000000 +0000 +++ language-selector-0.184/data/pkg_depends 2017-11-16 20:39:05.000000000 +0000 @@ -63,6 +63,9 @@ wa:zu:libreoffice-common:myspell-zu # Package names not matching the locale +wa:de:libreoffice-common:hunspell-de-at-frami +wa:de:libreoffice-common:hunspell-de-ch-frami +wa:de:libreoffice-common:hunspell-de-de-frami wa:nb:libreoffice-common:hunspell-no wa:nb:libreoffice-common:hyphen-no wa:nb:libreoffice-common:mythes-no @@ -124,7 +127,6 @@ fn:kn::fonts-knda fn:ko::fonts-noto-cjk fn:ko::fonts-noto-cjk-extra -fn:ko::fonts-unfonts-core fn:lo::fonts-lao fn:ml::fonts-mlym fn:mn::fonts-manchufont diff -Nru language-selector-0.183/debian/changelog language-selector-0.184/debian/changelog --- language-selector-0.183/debian/changelog 2017-11-10 01:38:00.000000000 +0000 +++ language-selector-0.184/debian/changelog 2017-11-20 20:14:00.000000000 +0000 @@ -1,3 +1,15 @@ +language-selector (0.184) bionic; urgency=medium + + * data/pkg_depends: + - Don't pull fonts-unfonts-core for Korean (LP: #1581160). + - Pull hunspell-de-XX-frami for German. + * language_support_pkgs.py: + - Exclude hunspell-de-XX since they conflict with -frami. + - Drop the _hunspell_frami_special() function - not applicable + when -frami is pulled by default. + + -- Gunnar Hjalmarsson Mon, 20 Nov 2017 21:14:00 +0100 + language-selector (0.183) bionic; urgency=medium * fontconfig/30-cjk-aliases.conf: diff -Nru language-selector-0.183/language_support_pkgs.py language-selector-0.184/language_support_pkgs.py --- language-selector-0.183/language_support_pkgs.py 2017-09-19 21:39:46.000000000 +0000 +++ language-selector-0.184/language_support_pkgs.py 2017-11-16 20:34:16.000000000 +0000 @@ -55,6 +55,11 @@ if p.startswith('fcitx'): packages.remove(p) + # exclude hunspell-de-XX since they conflict with -frami + for country in ['de', 'at', 'ch']: + if 'hunspell-de-' + country in packages: + packages.remove('hunspell-de-' + country) + # exclude hunspell-gl since it conflicts with hunspell-gl-es # https://launchpad.net/bugs/1578821 if 'hunspell-gl' in packages: @@ -121,28 +126,7 @@ for lang in self.available_languages(): packages.update(self.by_locale(lang, installed)) - return self._hunspell_frami_special(packages) - - def _hunspell_frami_special(self, packages): - ''' Ignore missing hunspell-de-xx if hunspell-de-xx-frami is installed. - - https://launchpad.net/bugs/1103547 - ''' - framis = [] - for country in ['de', 'at', 'ch']: - frami = 'hunspell-de-' + country + '-frami' - try: - if self.apt_cache[frami].installed: - framis.append(frami) - except KeyError: - pass - if len(framis) == 0: - return packages - packages_new = set() - for pack in packages: - if pack + '-frami' not in framis: - packages_new.add(pack) - return packages_new + return packages def available_languages(self): '''List available languages in the system.