[openjdk-8] 01/02: Suggest fonts-indic instead of ttf-indic-fonts (See #747694)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit d9b692d0051f2d9a20ca47ab812ffa2629e3c004
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 20 16:41:12 2014 +0200

    Suggest fonts-indic instead of ttf-indic-fonts (See #747694)
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 440d49d..47803b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ openjdk-8 (8u5-b13-1) experimental; urgency=medium
   * Added a script to download the upstream tarball
   * JamVM is no longer recommended on architectures supporting Hotspot
   * Removed the transitional Cacao and openjdk-<n>-jre-lib packages
+  * Suggest fonts-indic instead of ttf-indic-fonts (See #747694)
   * Changed to 3.0 (quilt) source format
   * Switch to debhelper level 9
   * Added a watch file
diff --git a/debian/control b/debian/control
index 763c049..191a853 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
 Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dlopenhl:Recommends}
-Suggests: libnss-mdns, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts,
+Suggests: libnss-mdns, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, fonts-indic,
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, java8-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
 Breaks: icedtea-netx (<< 1.4-2)
 Description: OpenJDK Java runtime, using ${vm:Name} (headless)
diff --git a/debian/rules b/debian/rules
index f6a8cc9..608bd51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -646,11 +646,13 @@ cjk_fonts += fonts-ipafont-gothic, fonts-ipafont-mincho,
 # FIXME: find out why this b-d is needed, the fontconfig compiler fails without it
 bd_openjdk += fonts-ipafont-mincho,
 cjk_fonts += $(if $(with_wgy_zenhai),ttf-wqy-microhei | ttf-wqy-zenhei,ttf-arphic-uming),
-ifneq (,$(filter $(distrel),wheezy sid experimental))
+ifneq (,$(filter $(distrel),wheezy))
   cjk_fonts += ttf-indic-fonts,
-else
+else ifneq (,$(filter $(distrel), precise quantal raring saucy))
   cjk_fonts += ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts,
   cjk_fonts += ttf-kannada-fonts, ttf-bengali-fonts,
+else
+  cjk_fonts += fonts-indic,
 endif
 
 p_jre	= $(basename)-jre

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git