[libreoffice] 06/07: use new fonts-* packages for indic fonts where not already doneuse new fonts-* packages for indic fonts where not already done
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.
commit bca923e3e85808d231aacacec7a10fbc1ac0e69d
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 11 17:35:36 2014 +0200
use new fonts-* packages for indic fonts where not already doneuse new fonts-* packages for indic fonts where not already done
---
changelog | 2 ++
control | 28 ++++++++++++++--------------
rules | 22 ++++++++++++++++++++--
3 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/changelog b/changelog
index b87b246..91d05fe 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:4.2.4-2) unstable; urgency=low
- actually add kfreebsd-* as GCJ_JDK_ARCHS again
- use gcc 4.9 on GCJ_JDK_ARCHS
- re-add ENABLE_TEST_PACKAGE=y
+ - use new fonts-* packages for indic fonts where not already done
+ (closes: #747692)
-- Rene Engelhard <rene@debian.org> Sat, 10 May 2014 18:52:17 +0200
diff --git a/control b/control
index 96bed63..bf47862 100644
--- a/control
+++ b/control
@@ -1157,8 +1157,8 @@ Architecture: all
Depends: libreoffice-common,
locales | belocs-locales-data | locales-all,
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-bn,
- ttf-bengali-fonts
+Recommends: fonts-beng,
+ libreoffice-core (>> ${base-version}) | language-support-translations-bn
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-bn | myspell-dictionary-bn,
hyphen-bn,
@@ -1842,8 +1842,8 @@ Architecture: all
Depends: libreoffice-common,
locales | belocs-locales-data | locales-all,
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gu,
- ttf-gujarati-fonts
+Recommends: fonts-gujr,
+ libreoffice-core (>> ${base-version}) | language-support-translations-gu
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-gu | myspell-dictionary-gu,
hyphen-gu,
@@ -2403,8 +2403,8 @@ Architecture: all
Depends: libreoffice-common,
locales | belocs-locales-data | locales-all,
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ml,
- ttf-malayalam-fonts
+Recommends: fonts-mlym,
+ libreoffice-core (>> ${base-version}) | language-support-translations-ml
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ml | myspell-dictionary-ml,
hyphen-ml,
@@ -2716,8 +2716,8 @@ Architecture: all
Depends: libreoffice-common,
locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1),
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-or,
- ttf-oriya-fonts
+Recommends: fonts-orya,
+ libreoffice-core (>> ${base-version}) | language-support-translations-or
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-or | myspell-dictionary-or,
hyphen-or,
@@ -2748,8 +2748,8 @@ Architecture: all
Depends: libreoffice-common,
locales | belocs-locales-data | locales-all,
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pa,
- ttf-punjabi-fonts
+Recommends: fonts-guru,
+ libreoffice-core (>> ${base-version}) | language-support-translations-pa
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-pa-in | myspell-dictionary-pa-in,
hyphen-pa-in,
@@ -3183,8 +3183,8 @@ Architecture: all
Depends: libreoffice-common,
locales | belocs-locales-data | locales-all,
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ta,
- ttf-tamil-fonts
+Recommends: fonts-taml,
+ libreoffice-core (>> ${base-version}) | language-support-translations-ta
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ta | myspell-dictionary-ta,
hyphen-ta,
@@ -3215,8 +3215,8 @@ Architecture: all
Depends: libreoffice-common,
locales | belocs-locales-data | locales-all,
${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-te,
- ttf-telugu-fonts
+Recommends: fonts-telu,
+ libreoffice-core (>> ${base-version}) | language-support-translations-te
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-te | myspell-dictionary-te,
hyphen-te,
diff --git a/rules b/rules
index bc2885c..24f10dc 100755
--- a/rules
+++ b/rules
@@ -1536,8 +1536,26 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
[ "$$LCODE" = kmr-latn ] && LCODE=kmr; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
case "$$LCODE" in \
- bn|gu|pa-in|ml|or|te|ta) \
- FONT_SUGGESTS=", ttf-`echo $$LNAME | tr A-Z a-z`-fonts"; \
+ bn) \
+ FONT_SUGGESTS=", fonts-beng"; \
+ ;; \
+ gu) \
+ FONT_SUGGESTS=", fonts-gujr"; \
+ ;; \
+ pa-in) \
+ FONT_SUGGESTS=", fonts-guru"; \
+ ;; \
+ ml) \
+ FONT_SUGGESTS=", fonts-mlym"; \
+ ;; \
+ or) \
+ FONT_SUGGESTS=", fonts-orya"; \
+ ;; \
+ te) \
+ FONT_SUGGESTS=", fonts-telu"; \
+ ;; \
+ ta) \
+ FONT_SUGGESTS=", fonts-taml"; \
;; \
hi-in|ne|mr) \
FONT_SUGGESTS=", fonts-deva"; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: