diff -u openjdk-7-7~u3-2.1/debian/JB-jre.preinst.in openjdk-7-7~u3-2.1/debian/JB-jre.preinst.in --- openjdk-7-7~u3-2.1/debian/JB-jre.preinst.in +++ openjdk-7-7~u3-2.1/debian/JB-jre.preinst.in @@ -14,7 +14,7 @@ upgrade) if [ -n "$multiarch" ] && [ -n "$2" ]; then for i in $jre_tools; do - if [ -n `update-alternatives --list $i 2>/dev/null | grep "^$old_basedir/"` ]; then + if [ -n "$(update-alternatives --list $i 2>/dev/null | grep ^$old_basedir/)" ]; then update-alternatives --remove $i $old_basedir/jre/bin/$i || true fi done diff -u openjdk-7-7~u3-2.1/debian/JB-jre.postinst.in openjdk-7-7~u3-2.1/debian/JB-jre.postinst.in --- openjdk-7-7~u3-2.1/debian/JB-jre.postinst.in +++ openjdk-7-7~u3-2.1/debian/JB-jre.postinst.in @@ -22,7 +22,7 @@ fi if [ -n "$multiarch" ] && [ -n "$2" ]; then for i in $jre_tools; do - if [ -z `update-alternatives --list $i 2>/dev/null | grep "^$basedir/"` ]; then + if [ -z "$(update-alternatives --list $i 2>/dev/null | grep ^$basedir/)" ]; then update_alternatives=y break fi diff -u openjdk-7-7~u3-2.1/debian/rules openjdk-7-7~u3-2.1/debian/rules --- openjdk-7-7~u3-2.1/debian/rules +++ openjdk-7-7~u3-2.1/debian/rules @@ -45,7 +45,6 @@ # Shark build but just crash shark_archs = endif -no_bootstrap_archs = alpha armel VENDOR = openjdk Vendor = OpenJDK @@ -122,8 +121,8 @@ default_vm = $(if $(filter $(DEB_HOST_ARCH), $(hotspot_archs)),hotspot,zero) -stage1_gcj_archs = amd64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64 -stage1_openjdk_archs = alpha armel +stage1_gcj_archs = alpha amd64 armel armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64 +stage1_openjdk_archs = stage1_cacao_archs = ifneq (,$(filter nobootstrap, $(DEB_BUILD_OPTIONS))) stage1_openjdk_archs := $(stage1_openjdk_archs) $(stage1_gcj_archs) @@ -366,13 +365,21 @@ debian/patches/hotspot-sparc.diff \ debian/patches/hotspot-sparc-arch.diff \ debian/patches/sparc-trapsfix.patch \ + debian/patches/sparc-stubgenerator.diff \ debian/patches/zero-fpu-control-is-noop.diff \ debian/patches/zero-missing-headers.diff \ - debian/patches/hsx23-zero.patch + debian/patches/hsx23-zero.patch \ + debian/patches/enumipv6-fix.patch \ # FIXME needs an update: # $(if $(with_wgy_zenhai),,debian/patches/fontconfig-arphic-uming.diff) \ +ifeq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid jaunty intrepid hardy gutsy feisty edgy dapper)) + DISTRIBUTION_PATCHES += \ + debian/patches/fontconfig-korean-nanum.diff \ + debian/patches/fontconfig-japanese.diff +endif + # debian/patches/sparc-inline.diff \ # debian/patches/pkcs11-secmod-debug.diff \ @@ -779,9 +786,14 @@ else core_fonts = ttf-dejavu-extra endif -cjk_fonts = ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, -cjk_fonts += ttf-sazanami-gothic | ttf-kochi-gothic, -cjk_fonts += ttf-sazanami-mincho | ttf-kochi-mincho, +ifeq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid jaunty intrepid hardy gutsy feisty edgy dapper)) + cfk_fonts = fonts-nanum, + cjk_fonts += fonts-ipafont-gothic, fonts-ipafont-mincho, +else + cjk_fonts = ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, + cjk_fonts += ttf-sazanami-gothic | ttf-kochi-gothic, + cjk_fonts += ttf-sazanami-mincho | ttf-kochi-mincho, +endif cjk_fonts += $(if $(with_wgy_zenhai),ttf-wqy-microhei | ttf-wqy-zenhei,ttf-arphic-uming), ifneq (,$(filter $(distrel),lenny squeeze sid experimental)) cjk_fonts += ttf-indic-fonts, @@ -1007,11 +1019,6 @@ chmod +x configure cd build && $(EXTRA_BUILD_ENV) ../configure $(CONFIGURE_ARGS) - grep -v '^nssLibraryDirectory' build/nss.cfg > build/nss.cfg.new - mv -f build/nss.cfg.new build/nss.cfg - cat build/nss.cfg - if grep -q '^nssLibraryDirectory' build/nss.cfg; then false; fi - touch $@ unpack: stamps/unpack @@ -1477,6 +1484,11 @@ rm -f $(d)/$(basedir)/jre/lib/security/cacerts endif + grep -v '^nssLibraryDirectory' $(d)/$(basedir)/jre/lib/security/nss.cfg \ + > $(d)/$(basedir)/jre/lib/security/nss.cfg.new + mv -f $(d)/$(basedir)/jre/lib/security/nss.cfg.new \ + $(d)/$(basedir)/jre/lib/security/nss.cfg + : # move config files to $(etcdir) and symlink them. for i in \ accessibility.properties \ @@ -1970 +1982 @@ -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install packaging-files diff -u openjdk-7-7~u3-2.1/debian/JB-jre-headless.preinst.in openjdk-7-7~u3-2.1/debian/JB-jre-headless.preinst.in --- openjdk-7-7~u3-2.1/debian/JB-jre-headless.preinst.in +++ openjdk-7-7~u3-2.1/debian/JB-jre-headless.preinst.in @@ -14,11 +14,11 @@ upgrade) if [ -n "$multiarch" ] && [ -n "$2" ]; then for i in $jre_tools; do - if [ -n `update-alternatives --list $i 2>/dev/null | grep "^$old_basedir/"` ]; then + if [ -n "$(update-alternatives --list $i 2>/dev/null | grep ^$old_basedir/)" ]; then update-alternatives --remove $i $old_basedir/jre/bin/$i || true fi done - if [ -n `update-alternatives --list jexec 2>/dev/null | grep "^$old_basedir/"` ]; then + if [ -n "$(update-alternatives --list jexec 2>/dev/null | grep ^$old_basedir/)" ]; then update-alternatives --remove jexec $old_basedir/jre/lib/jexec || true fi fi diff -u openjdk-7-7~u3-2.1/debian/control openjdk-7-7~u3-2.1/debian/control --- openjdk-7-7~u3-2.1/debian/control +++ openjdk-7-7~u3-2.1/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: OpenJDK Team Uploaders: Torsten Werner , Matthias Klose , Damien Raude-Morvan -Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2), autoconf, automake, autotools-dev, ant, ant-optional, libtool, libtool, g++-4.6, ecj-gcj [amd64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64], gcj-4.4-jdk [mips mipsel sparc sparc64], g++-4.4 [mips mipsel sparc sparc64], openjdk-6-jdk (>= 6b18) [alpha armel], libxtst-dev, libxi-dev, libxt-dev, libxp-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, xsltproc, librhino-java (>= 1.7R3~), libffi-dev, libpng12-dev, zlib1g-dev, libattr1-dev, libjpeg8-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, twm | metacity, twm | dbus-x11, x11-xkb-utils, +Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2), autoconf, automake, autotools-dev, ant, ant-optional, libtool, libtool, g++-4.6, ecj-gcj [alpha amd64 armel armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64], gcj-jdk [alpha amd64 armel armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64], libxtst-dev, libxi-dev, libxt-dev, libxp-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, xsltproc, librhino-java (>= 1.7R3~), libffi-dev, libpng12-dev, zlib1g-dev, libattr1-dev, libjpeg8-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.9+ckbi-1.82-0ubuntu4), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, metacity | twm, dbus-x11, x11-xkb-utils, Standards-Version: 3.9.2 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk7 @@ -13,7 +13,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${dpkg:Depends} -Depends: openjdk-7-jre (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: openjdk-7-jre (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: libxt-dev Suggests: openjdk-7-demo, openjdk-7-source, visualvm Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java7-jdk, java-compiler @@ -28,9 +28,9 @@ Architecture: any Multi-Arch: same Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends} -Depends: openjdk-7-jre-lib (= ${source:Version}), ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: openjdk-7-jre-lib (>= ${source:Version}), ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends}, ${shlibs:Depends}, ${misc:Depends} Recommends: ${dlopenjl:Recommends}, ${cacao:Recommends}, ${jamvm:Recommends} -Suggests: libnss-mdns, sun-java6-fonts, ttf-dejavu-extra, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-sazanami-gothic | ttf-kochi-gothic, ttf-sazanami-mincho | ttf-kochi-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts, +Suggests: libnss-mdns, sun-java6-fonts, ttf-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts-core, ttf-telugu-fonts, ttf-oriya-fonts, ttf-kannada-fonts, ttf-bengali-fonts, Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides} Conflicts: ${multiarch:Conflicts} Description: OpenJDK Java runtime, using ${vm:Name} (headless) @@ -44,7 +44,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${dpkg:Depends} -Depends: openjdk-7-jre-headless (= ${binary:Version}), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends}, ${dep:bridge} +Depends: openjdk-7-jre-headless (>= ${binary:Version}), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends}, ${dep:bridge} Recommends: ${dlopenjre:Recommends}, ttf-dejavu-extra Suggests: icedtea6-plugin, ${pkg:pulseaudio} Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4) @@ -73,7 +73,7 @@ Multi-Arch: same Priority: extra Pre-Depends: ${dpkg:Depends} -Depends: openjdk-7-jre (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: openjdk-7-jre (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Java runtime based on OpenJDK (demos and examples) OpenJDK Java runtime . diff -u openjdk-7-7~u3-2.1/debian/JB-jre-headless.postinst.in openjdk-7-7~u3-2.1/debian/JB-jre-headless.postinst.in --- openjdk-7-7~u3-2.1/debian/JB-jre-headless.postinst.in +++ openjdk-7-7~u3-2.1/debian/JB-jre-headless.postinst.in @@ -36,7 +36,7 @@ fi if [ -n "$multiarch" ] && [ -n "$2" ]; then for i in $jre_tools; do - if [ -z `update-alternatives --list $i 2>/dev/null | grep "^$basedir/"` ]; then + if [ -z "$(update-alternatives --list $i 2>/dev/null | grep ^$basedir/)" ]; then update_alternatives=y break fi diff -u openjdk-7-7~u3-2.1/debian/JB-jdk.postinst.in openjdk-7-7~u3-2.1/debian/JB-jdk.postinst.in --- openjdk-7-7~u3-2.1/debian/JB-jdk.postinst.in +++ openjdk-7-7~u3-2.1/debian/JB-jdk.postinst.in @@ -23,7 +23,7 @@ fi if [ -n "$multiarch" ] && [ -n "$2" ]; then for i in $jdk_tools; do - if [ -z `update-alternatives --list $i 2>/dev/null | grep "^$basedir/"` ]; then + if [ -z "$(update-alternatives --list $i 2>/dev/null | grep ^$basedir/)" ]; then update_alternatives=y break fi diff -u openjdk-7-7~u3-2.1/debian/JB-jdk.preinst.in openjdk-7-7~u3-2.1/debian/JB-jdk.preinst.in --- openjdk-7-7~u3-2.1/debian/JB-jdk.preinst.in +++ openjdk-7-7~u3-2.1/debian/JB-jdk.preinst.in @@ -10,7 +10,7 @@ upgrade) if [ -n "$multiarch" ] && [ -n "$2" ]; then for i in $jdk_tools; do - if [ -n `update-alternatives --list $i 2>/dev/null | grep "^$old_basedir/"` ]; then + if [ -n "$(update-alternatives --list $i 2>/dev/null | grep ^$old_basedir/)" ]; then update-alternatives --remove $i $old_basedir/bin/$i || true fi done diff -u openjdk-7-7~u3-2.1/debian/changelog openjdk-7-7~u3-2.1/debian/changelog --- openjdk-7-7~u3-2.1/debian/changelog +++ openjdk-7-7~u3-2.1/debian/changelog @@ -1,3 +1,19 @@ +openjdk-7 (7~u3-2.1-1ubuntu3) precise; urgency=low + + [ Matthias Klose ] + * Use NanumMyeongjo as the preferred korean font. LP: #792471. + * Fix crash in java.net.NetworkInterface.getNetworkInterfaces() when + ifr_ifindex exceeds 255. LP: #925218. S7078386. + * Use IPAfont as the preferred japanesse font. Closes: #646054. + * Build using gcj on alpha and armel. Closes: #655750. + + [ Damien Raude-Morvan ] + * d/patches/sparc-stubgenerator.diff: Fix FTBFS on sparc on + stubGenerator_sparc.cpp by using explicit class typedef (Closes: + #660871). + + -- Matthias Klose Mon, 27 Feb 2012 13:05:41 +0100 + openjdk-7 (7~u3-2.1-1ubuntu2) precise; urgency=low * Make sure that the nss.cfg doesn't mention any library path. @@ -10,7 +26,7 @@ [ Damien Raude-Morvan ] * d/patches/jexec.diff: Dropped, uneeded and not compatible with multi-arch. - * d/rules: Use dpkg-buildflags --export=configure to enable hardened build. + * d/rules: Use dpkg-buildflags to enable hardened build. (Closes: #660021). [ Matthias Klose ] reverted: --- openjdk-7-7~u3-2.1/debian/icedtea-6-jre-jamvm.overrides +++ openjdk-7-7~u3-2.1.orig/debian/icedtea-6-jre-jamvm.overrides @@ -1,2 +0,0 @@ -# Strip libjvm.so with --strip-debug instead of --strip-unneeded. LP: #574997. -icedtea-6-jre-jamvm binary: unstripped-binary-or-object reverted: --- openjdk-7-7~u3-2.1/debian/icedtea-6-jre-jamvm/usr/share/lintian/overrides/icedtea-6-jre-jamvm +++ openjdk-7-7~u3-2.1.orig/debian/icedtea-6-jre-jamvm/usr/share/lintian/overrides/icedtea-6-jre-jamvm @@ -1,2 +0,0 @@ -# Strip libjvm.so with --strip-debug instead of --strip-unneeded. LP: #574997. -icedtea-6-jre-jamvm binary: unstripped-binary-or-object only in patch2: unchanged: --- openjdk-7-7~u3-2.1.orig/debian/patches/sparc-stubgenerator.diff +++ openjdk-7-7~u3-2.1/debian/patches/sparc-stubgenerator.diff @@ -0,0 +1,44 @@ +Author: Damien Raude-Morvan +Description: Fix FTBFS on sparc on stubGenerator_sparc.cpp by using explicit class typedef. + +--- openjdk/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp.orig 2012-02-15 08:26:53.000000000 +0000 ++++ openjdk/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp 2012-02-26 10:26:11.000000000 +0000 +@@ -1126,7 +1126,7 @@ + Label& L_loop, bool use_prefetch, bool use_bis); + + void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size, +- int iter_size, CopyLoopFunc copy_loop_func) { ++ int iter_size, StubGenerator::CopyLoopFunc copy_loop_func) { + Label L_copy; + + assert(log2_elem_size <= 3, "the following code should be changed"); +@@ -1277,7 +1277,8 @@ + __ inc(from, 8); + __ sllx(O3, left_shift, O3); + +- disjoint_copy_core(from, to, count, log2_elem_size, 16, copy_16_bytes_shift_loop); ++ StubGenerator::CopyLoopFunc aFunction = &StubGenerator::copy_16_bytes_shift_loop; ++ disjoint_copy_core(from, to, count, log2_elem_size, 16, aFunction); + + __ inccc(count, count_dec>>1 ); // + 8 bytes + __ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes); +@@ -2156,7 +2157,8 @@ + __ dec(count, 4); // The cmp at the beginning guaranty count >= 4 + __ sllx(O3, 32, O3); + +- disjoint_copy_core(from, to, count, 2, 16, copy_16_bytes_loop); ++ StubGenerator::CopyLoopFunc aFunction = &StubGenerator::copy_16_bytes_loop; ++ disjoint_copy_core(from, to, count, 2, 16, aFunction); + + __ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes); + __ delayed()->inc(count, 4); // restore 'count' +@@ -2437,7 +2439,8 @@ + // count >= 0 (original count - 8) + __ mov(from, from64); + +- disjoint_copy_core(from64, to64, count, 3, 64, copy_64_bytes_loop); ++ StubGenerator::CopyLoopFunc aFunction = &StubGenerator::copy_64_bytes_loop; ++ disjoint_copy_core(from64, to64, count, 3, 64, aFunction); + + // Restore O4(offset0), O5(offset8) + __ sub(from64, from, offset0); only in patch2: unchanged: --- openjdk-7-7~u3-2.1.orig/debian/patches/enumipv6-fix.patch +++ openjdk-7-7~u3-2.1/debian/patches/enumipv6-fix.patch @@ -0,0 +1,11 @@ +--- openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c~ 2012-02-15 09:26:50.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c 2012-02-26 14:13:22.602107361 +0100 +@@ -1105,7 +1105,7 @@ + uint8_t ipv6addr[16]; + + if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) { +- while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n", ++ while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %x %x %x %x %20s\n", + addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4], addr6p[5], addr6p[6], addr6p[7], + &if_idx, &plen, &scope, &dad_status, devname) != EOF) { + only in patch2: unchanged: --- openjdk-7-7~u3-2.1.orig/debian/patches/fontconfig-korean-nanum.diff +++ openjdk-7-7~u3-2.1/debian/patches/fontconfig-korean-nanum.diff @@ -0,0 +1,267 @@ +# used for Debian wheezy and Ubuntu 12.04 LTS or newer + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties +@@ -60,200 +60,140 @@ + serif.plain.japanese-kochi=Kochi Mincho + serif.plain.japanese-sazanami=Sazanami Mincho + serif.plain.japanese-vlgothic=Sazanami Mincho +-serif.plain.korean-baekmuk=Baekmuk Batang +-#serif.plain.korean-baekmuk.motif=Baekmuk Batang +-serif.plain.korean-un=UnBatang +-#serif.plain.korean-un.motif=UnBatang ++serif.plain.korean-nanum=NanumMyeongjo + + serif.bold.latin-1=DejaVu Serif Bold + #serif.bold.latin-1.motif=LuxiSerif-Bold + serif.bold.japanese-kochi=Kochi Mincho + serif.bold.japanese-sazanami=Sazanami Mincho + serif.bold.japanese-vlgothic=Sazanami Mincho +-serif.bold.korean-baekmuk=Baekmuk Batang +-#serif.bold.korean-baekmuk.motif=Baekmuk Batang +-serif.bold.korean-un=UnBatang Bold +-#serif.bold.korean-un.motif=UnBatang Bold ++serif.bold.korean-nanum=NanumMyeongjo Bold + + serif.italic.latin-1=DejaVu Serif Oblique + #serif.italic.latin-1.motif=LuxiSerif-Oblique + serif.italic.japanese-kochi=Kochi Mincho + serif.italic.japanese-sazanami=Sazanami Mincho + serif.italic.japanese-vlgothic=Sazanami Mincho +-serif.italic.korean-baekmuk=Baekmuk Batang +-#serif.italic.korean-baekmuk.motif=Baekmuk Batang +-serif.italic.korean-un=UnBatang +-#serif.italic.korean-un.motif=UnBatang ++serif.italic.korean-nanum=NanumMyeongjo + + serif.bolditalic.latin-1=DejaVu Serif Bold Oblique + #serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique + serif.bolditalic.japanese-kochi=Kochi Mincho + serif.bolditalic.japanese-sazanami=Sazanami Mincho + serif.bolditalic.japanese-vlgothic=Sazanami Mincho +-serif.bolditalic.korean-baekmuk=Baekmuk Batang +-#serif.bolditalic.korean-baekmuk.motif=Baekmuk Batang +-serif.bolditalic.korean-un=UnBatang Bold +-#serif.bolditalic.korean-un.motif=UnBatang Bold ++serif.bolditalic.korean-nanum=NanumMyeongjo Bold + + sansserif.plain.latin-1=DejaVu Sans + #sansserif.plain.latin-1.motif=LuxiSans-Regular + sansserif.plain.japanese-kochi=Kochi Gothic + sansserif.plain.japanese-sazanami=Sazanami Gothic + sansserif.plain.japanese-vlgothic=VL PGothic +-sansserif.plain.korean-baekmuk=Baekmuk Gulim +-#sansserif.plain.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.plain.korean-un=UnDotum +-#sansserif.plain.korean-un.motif=UnDotum ++sansserif.plain.korean-nanum=NanumGothic + + sansserif.bold.latin-1=DejaVu Sans Bold + #sansserif.bold.latin-1.motif=LuxiSans-Bold + sansserif.bold.japanese-kochi=Kochi Gothic + sansserif.bold.japanese-sazanami=Sazanami Gothic + sansserif.bold.japanese-vlgothic=VL PGothic +-sansserif.bold.korean-baekmuk=Baekmuk Gulim +-#sansserif.bold.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.bold.korean-un=UnDotum Bold +-#sansserif.bold.korean-un.motif=UnDotum Bold ++sansserif.bold.korean-nanum=NanumGothic Bold + + sansserif.italic.latin-1=DejaVu Sans Oblique + #sansserif.italic.latin-1.motif=LuxiSans-Oblique + sansserif.italic.japanese-kochi=Kochi Gothic + sansserif.italic.japanese-sazanami=Sazanami Gothic + sansserif.italic.japanese-vlgothic=VL PGothic +-sansserif.italic.korean-baekmuk=Baekmuk Gulim +-#sansserif.italic.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.italic.korean-un=UnDotum +-#sansserif.italic.korean-un.motif=UnDotum ++sansserif.italic.korean-nanum=NanumGothic + + sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique + #sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique + sansserif.bolditalic.japanese-kochi=Kochi Gothic + sansserif.bolditalic.japanese-sazanami=Sazanami Gothic + sansserif.bolditalic.japanese-vlgothic=VL PGothic +-sansserif.bolditalic.korean-baekmuk=Baekmuk Gulim +-#sansserif.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.bolditalic.korean-un=UnDotum Bold +-#sansserif.bolditalic.korean-un.motif=UnDotum Bold ++sansserif.bolditalic.korean-nanum=NanumGothic Bold + + monospaced.plain.latin-1=DejaVu Sans Mono + #monospaced.plain.latin-1.motif=LuxiMono-Regular + monospaced.plain.japanese-kochi=Kochi Gothic + monospaced.plain.japanese-sazanami=Sazanami Gothic + monospaced.plain.japanese-vlgothic=VL Gothic +-monospaced.plain.korean-baekmuk=Baekmuk Gulim +-#monospaced.plain.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.plain.korean-un=UnDotum +-#monospaced.plain.korean-un.motif=UnDotum ++monospaced.plain.korean-nanumcoding=NanumGothicCoding + + monospaced.bold.latin-1=DejaVu Sans Mono Bold + #monospaced.bold.latin-1.motif=LuxiMono-Bold + monospaced.bold.japanese-kochi=Kochi Gothic + monospaced.bold.japanese-sazanami=Sazanami Gothic + monospaced.bold.japanese-vlgothic=VL Gothic +-monospaced.bold.korean-baekmuk=Baekmuk Gulim +-#monospaced.bold.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.bold.korean-un=UnDotum Bold +-#monospaced.bold.korean-un.motif=UnDotum Bold ++monospaced.bold.korean-nanumcoding=NanumGothicCoding Bold + + monospaced.italic.latin-1=DejaVu Sans Mono Oblique + #monospaced.italic.latin-1.motif=LuxiMono-Oblique + monospaced.italic.japanese-kochi=Kochi Gothic + monospaced.italic.japanese-sazanami=Sazanami Gothic + monospaced.italic.japanese-vlgothic=VL Gothic +-monospaced.italic.korean-baekmuk=Baekmuk Gulim +-#monospaced.italic.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.italic.korean-un=UnDotum +-#monospaced.italic.korean-un.motif=UnDotum ++monospaced.italic.korean-nanumcoding=NanumGothicCoding + + monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique + #monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique + monospaced.bolditalic.japanese-kochi=Kochi Gothic + monospaced.bolditalic.japanese-sazanami=Sazanami Gothic + monospaced.bolditalic.japanese-vlgothic=VL Gothic +-monospaced.bolditalic.korean-baekmuk=Baekmuk Gulim +-#monospaced.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.bolditalic.korean-un=UnDotum Bold +-#monospaced.bolditalic.korean-un.motif=UnDotum Bold ++monospaced.bolditalic.korean-nanumcoding=NanumGothicCoding Bold + + dialog.plain.latin-1=DejaVu Sans + #dialog.plain.latin-1.motif=LuxiSans-Regular + dialog.plain.japanese-kochi=Kochi Gothic + dialog.plain.japanese-sazanami=Sazanami Gothic + dialog.plain.japanese-vlgothic=VL PGothic +-dialog.plain.korean-baekmuk=Baekmuk Gulim +-#dialog.plain.korean-baekmuk.motif=Baekmuk Gulim +-dialog.plain.korean-un=UnDotum +-#dialog.plain.korean-un.motif=UnDotum ++dialog.plain.korean-nanum=NanumGothic + + dialog.bold.latin-1=DejaVu Sans Bold + #dialog.bold.latin-1.motif=LuxiSans-Bold + dialog.bold.japanese-kochi=Kochi Gothic + dialog.bold.japanese-sazanami=Sazanami Gothic + dialog.bold.japanese-vlgothic=VL PGothic +-dialog.bold.korean-baekmuk=Baekmuk Gulim +-#dialog.bold.korean-baekmuk.motif=Baekmuk Gulim +-dialog.bold.korean-un=UnDotum Bold +-#dialog.bold.korean-un.motif=UnDotum Bold ++dialog.bold.korean-nanum=NanumGothic Bold + + dialog.italic.latin-1=DejaVu Sans Oblique + #dialog.italic.latin-1.motif=LuxiSans-Oblique + dialog.italic.japanese-kochi=Kochi Gothic + dialog.italic.japanese-sazanami=Sazanami Gothic + dialog.italic.japanese-vlgothic=VL PGothic +-dialog.italic.korean-baekmuk=Baekmuk Gulim +-#dialog.italic.korean-baekmuk.motif=Baekmuk Gulim +-dialog.italic.korean-un=UnDotum +-#dialog.italic.korean-un.motif=UnDotum ++dialog.italic.korean-nanum=NanumGothic + + dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique + #dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique + dialog.bolditalic.japanese-kochi=Kochi Gothic + dialog.bolditalic.japanese-sazanami=Sazanami Gothic + dialog.bolditalic.japanese-vlgothic=VL PGothic +-dialog.bolditalic.korean-baekmuk=Baekmuk Gulim +-#dialog.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-dialog.bolditalic.korean-un=UnDotum Bold +-#dialog.bolditalic.korean-un.motif=UnDotum Bold ++dialog.bolditalic.korean-nanum=NanumGothic Bold + + dialoginput.plain.latin-1=DejaVu Sans Mono + #dialoginput.plain.latin-1.motif=LuxiMono-Regular + dialoginput.plain.japanese-kochi=Kochi Gothic + dialoginput.plain.japanese-sazanami=Sazanami Gothic + dialoginput.plain.japanese-vlgothic=VL Gothic +-dialoginput.plain.korean-baekmuk=Baekmuk Gulim +-#dialoginput.plain.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.plain.korean-un=UnDotum +-#dialoginput.plain.korean-un.motif=UnDotum ++dialoginput.plain.korean-nanum=NanumGothic + + dialoginput.bold.latin-1=DejaVu Sans Mono Bold + #dialoginput.bold.latin-1.motif=LuxiMono-Bold + dialoginput.bold.japanese-kochi=Kochi Gothic + dialoginput.bold.japanese-sazanami=Sazanami Gothic + dialoginput.bold.japanese-vlgothic=VL Gothic +-dialoginput.bold.korean-baekmuk=Baekmuk Gulim +-#dialoginput.bold.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.bold.korean-un=UnDotum Bold +-#dialoginput.bold.korean-un.motif=UnDotum Bold ++dialoginput.bold.korean-nanum=NanumGothic Bold + + dialoginput.italic.latin-1=DejaVu Sans Mono Oblique + #dialoginput.italic.latin-1.motif=LuxiMono-Oblique + dialoginput.italic.japanese-kochi=Kochi Gothic + dialoginput.italic.japanese-sazanami=Sazanami Gothic + dialoginput.italic.japanese-vlgothic=VL Gothic +-dialoginput.italic.korean-baekmuk=Baekmuk Gulim +-#dialoginput.italic.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.italic.korean-un=UnDotum +-#dialoginput.italic.korean-un.motif=UnDotum ++dialoginput.italic.korean-nanum=NanumGothic + + dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique + #dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique + dialoginput.bolditalic.japanese-kochi=Kochi Gothic + dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic + dialoginput.bolditalic.japanese-vlgothic=VL Gothic +-dialoginput.bolditalic.korean-baekmuk=Baekmuk Gulim +-#dialoginput.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.bolditalic.korean-un=UnDotum Bold +-#dialoginput.bolditalic.korean-un.motif=UnDotum Bold ++dialoginput.bolditalic.korean-nanum=NanumGothic Bold + + # Search Sequences + +@@ -262,11 +202,11 @@ + sequence.allfonts.GB2312=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei + sequence.allfonts.GBK=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei + sequence.allfonts.x-euc-jp-linux=latin-1,japanese-vlgothic,japanese-sazanami,japanese-kochi +-sequence.allfonts.EUC-KR=latin-1,korean-un,korean-baekmuk ++sequence.allfonts.EUC-KR=latin-1,korean-nanum + sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-microhei,wqy-zenhei + sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-microhei,wqy-zenhei +-#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala +-sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-sazanami,japanese-kochi,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu ++#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala ++sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-sazanami,japanese-kochi,korean-nanumcoding,korean-nanum,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu + + # Exclusion Ranges + +@@ -298,12 +238,12 @@ + + filename.WenQuanYi_Micro_Hei=/usr/share/fonts/truetype/wqy/wqy-microhei.ttc + filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf ++filename.NanumMyeongjo=/usr/share/fonts/truetype/nanum/NanumMyeongjo.ttf ++filename.NanumMyeongjo_Bold=/usr/share/fonts/truetype/nanum/NanumMyeongjoBold.ttf ++filename.NanumGothic=/usr/share/fonts/truetype/nanum/NanumGothic.ttf ++filename.NanumGothic_Bold=/usr/share/fonts/truetype/nanum/NanumGothicBold.ttf ++filename.NanumGothicCoding=/usr/share/fonts/truetype/nanum-coding/NanumGothic_Coding.ttf ++filename.NanumGothicCoding_Bold=/usr/share/fonts/truetype/nanum-coding/NanumGothic_Coding_Bold.ttf + filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf + filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf + filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +@@ -346,5 +286,5 @@ + awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi + awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami + awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ++awtfontpath.korean-nanum=/usr/share/fonts/truetype/nanum ++awtfontpath.korean-nanumcoding=/usr/share/fonts/truetype/nanum-coding only in patch2: unchanged: --- openjdk-7-7~u3-2.1.orig/debian/patches/fontconfig-japanese.diff +++ openjdk-7-7~u3-2.1/debian/patches/fontconfig-japanese.diff @@ -0,0 +1,223 @@ +# used for Debian wheezy and Ubuntu 12.04 LTS or newer + +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties +@@ -57,142 +57,142 @@ + + serif.plain.latin-1=DejaVu Serif + #serif.plain.latin-1.motif=LuxiSerif-Regular +-serif.plain.japanese-kochi=Kochi Mincho + serif.plain.japanese-sazanami=Sazanami Mincho + serif.plain.japanese-vlgothic=Sazanami Mincho ++serif.plain.japanese-ipafont-mincho=IPAMincho + serif.plain.korean-nanum=NanumMyeongjo + + serif.bold.latin-1=DejaVu Serif Bold + #serif.bold.latin-1.motif=LuxiSerif-Bold +-serif.bold.japanese-kochi=Kochi Mincho + serif.bold.japanese-sazanami=Sazanami Mincho + serif.bold.japanese-vlgothic=Sazanami Mincho ++serif.bold.japanese-ipafont-mincho=IPAMincho + serif.bold.korean-nanum=NanumMyeongjo Bold + + serif.italic.latin-1=DejaVu Serif Oblique + #serif.italic.latin-1.motif=LuxiSerif-Oblique +-serif.italic.japanese-kochi=Kochi Mincho + serif.italic.japanese-sazanami=Sazanami Mincho + serif.italic.japanese-vlgothic=Sazanami Mincho ++serif.italic.japanese-ipafont-mincho=IPAMincho + serif.italic.korean-nanum=NanumMyeongjo + + serif.bolditalic.latin-1=DejaVu Serif Bold Oblique + #serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique +-serif.bolditalic.japanese-kochi=Kochi Mincho + serif.bolditalic.japanese-sazanami=Sazanami Mincho + serif.bolditalic.japanese-vlgothic=Sazanami Mincho ++serif.bolditalic.japanese-ipafont-mincho=IPAMincho + serif.bolditalic.korean-nanum=NanumMyeongjo Bold + + sansserif.plain.latin-1=DejaVu Sans + #sansserif.plain.latin-1.motif=LuxiSans-Regular +-sansserif.plain.japanese-kochi=Kochi Gothic + sansserif.plain.japanese-sazanami=Sazanami Gothic + sansserif.plain.japanese-vlgothic=VL PGothic ++sansserif.plain.japanese-ipafont-gothic=IPAPGothic + sansserif.plain.korean-nanum=NanumGothic + + sansserif.bold.latin-1=DejaVu Sans Bold + #sansserif.bold.latin-1.motif=LuxiSans-Bold +-sansserif.bold.japanese-kochi=Kochi Gothic + sansserif.bold.japanese-sazanami=Sazanami Gothic + sansserif.bold.japanese-vlgothic=VL PGothic ++sansserif.bold.japanese-ipafont-gothic=IPAPGothic + sansserif.bold.korean-nanum=NanumGothic Bold + + sansserif.italic.latin-1=DejaVu Sans Oblique + #sansserif.italic.latin-1.motif=LuxiSans-Oblique +-sansserif.italic.japanese-kochi=Kochi Gothic + sansserif.italic.japanese-sazanami=Sazanami Gothic + sansserif.italic.japanese-vlgothic=VL PGothic ++sansserif.italic.japanese-ipafont-gothic=IPAPGothic + sansserif.italic.korean-nanum=NanumGothic + + sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique + #sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique +-sansserif.bolditalic.japanese-kochi=Kochi Gothic + sansserif.bolditalic.japanese-sazanami=Sazanami Gothic + sansserif.bolditalic.japanese-vlgothic=VL PGothic ++sansserif.bolditalic.japanese-ipafont-gothic=IPAPGothic + sansserif.bolditalic.korean-nanum=NanumGothic Bold + + monospaced.plain.latin-1=DejaVu Sans Mono + #monospaced.plain.latin-1.motif=LuxiMono-Regular +-monospaced.plain.japanese-kochi=Kochi Gothic + monospaced.plain.japanese-sazanami=Sazanami Gothic + monospaced.plain.japanese-vlgothic=VL Gothic ++monospaced.plain.japanese-ipafont-gothic=IPAGothic + monospaced.plain.korean-nanumcoding=NanumGothicCoding + + monospaced.bold.latin-1=DejaVu Sans Mono Bold + #monospaced.bold.latin-1.motif=LuxiMono-Bold +-monospaced.bold.japanese-kochi=Kochi Gothic + monospaced.bold.japanese-sazanami=Sazanami Gothic + monospaced.bold.japanese-vlgothic=VL Gothic ++monospaced.bold.japanese-ipafont-gothic=IPAGothic + monospaced.bold.korean-nanumcoding=NanumGothicCoding Bold + + monospaced.italic.latin-1=DejaVu Sans Mono Oblique + #monospaced.italic.latin-1.motif=LuxiMono-Oblique +-monospaced.italic.japanese-kochi=Kochi Gothic + monospaced.italic.japanese-sazanami=Sazanami Gothic + monospaced.italic.japanese-vlgothic=VL Gothic ++monospaced.italic.japanese-ipafont-gothic=IPAGothic + monospaced.italic.korean-nanumcoding=NanumGothicCoding + + monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique + #monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique +-monospaced.bolditalic.japanese-kochi=Kochi Gothic + monospaced.bolditalic.japanese-sazanami=Sazanami Gothic + monospaced.bolditalic.japanese-vlgothic=VL Gothic ++monospaced.bolditalic.japanese-ipafont-gothic=IPAGothic + monospaced.bolditalic.korean-nanumcoding=NanumGothicCoding Bold + + dialog.plain.latin-1=DejaVu Sans + #dialog.plain.latin-1.motif=LuxiSans-Regular +-dialog.plain.japanese-kochi=Kochi Gothic + dialog.plain.japanese-sazanami=Sazanami Gothic + dialog.plain.japanese-vlgothic=VL PGothic ++dialog.plain.japanese-ipafont-gothic=IPAPGothic + dialog.plain.korean-nanum=NanumGothic + + dialog.bold.latin-1=DejaVu Sans Bold + #dialog.bold.latin-1.motif=LuxiSans-Bold +-dialog.bold.japanese-kochi=Kochi Gothic + dialog.bold.japanese-sazanami=Sazanami Gothic + dialog.bold.japanese-vlgothic=VL PGothic ++dialog.bold.japanese-ipafont-gothic=IPAPGothic + dialog.bold.korean-nanum=NanumGothic Bold + + dialog.italic.latin-1=DejaVu Sans Oblique + #dialog.italic.latin-1.motif=LuxiSans-Oblique +-dialog.italic.japanese-kochi=Kochi Gothic + dialog.italic.japanese-sazanami=Sazanami Gothic + dialog.italic.japanese-vlgothic=VL PGothic ++dialog.italic.japanese-ipafont-gothic=IPAPGothic + dialog.italic.korean-nanum=NanumGothic + + dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique + #dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique +-dialog.bolditalic.japanese-kochi=Kochi Gothic + dialog.bolditalic.japanese-sazanami=Sazanami Gothic + dialog.bolditalic.japanese-vlgothic=VL PGothic ++dialog.bolditalic.japanese-ipafont-gothic=IPAPGothic + dialog.bolditalic.korean-nanum=NanumGothic Bold + + dialoginput.plain.latin-1=DejaVu Sans Mono + #dialoginput.plain.latin-1.motif=LuxiMono-Regular +-dialoginput.plain.japanese-kochi=Kochi Gothic + dialoginput.plain.japanese-sazanami=Sazanami Gothic + dialoginput.plain.japanese-vlgothic=VL Gothic ++dialoginput.plain.japanese-ipafont-gothic=IPAGothic + dialoginput.plain.korean-nanum=NanumGothic + + dialoginput.bold.latin-1=DejaVu Sans Mono Bold + #dialoginput.bold.latin-1.motif=LuxiMono-Bold +-dialoginput.bold.japanese-kochi=Kochi Gothic + dialoginput.bold.japanese-sazanami=Sazanami Gothic + dialoginput.bold.japanese-vlgothic=VL Gothic ++dialoginput.bold.japanese-ipafont-gothic=IPAGothic + dialoginput.bold.korean-nanum=NanumGothic Bold + + dialoginput.italic.latin-1=DejaVu Sans Mono Oblique + #dialoginput.italic.latin-1.motif=LuxiMono-Oblique +-dialoginput.italic.japanese-kochi=Kochi Gothic + dialoginput.italic.japanese-sazanami=Sazanami Gothic + dialoginput.italic.japanese-vlgothic=VL Gothic ++dialoginput.italic.japanese-ipafont-gothic=IPAGothic + dialoginput.italic.korean-nanum=NanumGothic + + dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique + #dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique +-dialoginput.bolditalic.japanese-kochi=Kochi Gothic + dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic + dialoginput.bolditalic.japanese-vlgothic=VL Gothic ++dialoginput.bolditalic.japanese-ipafont-gothic=IPAGothic + dialoginput.bolditalic.korean-nanum=NanumGothic Bold + + # Search Sequences +@@ -201,18 +201,21 @@ + sequence.allfonts.GB18030=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei + sequence.allfonts.GB2312=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei + sequence.allfonts.GBK=latin-1,wqy-microhei,umingcn,shanheisun,wqy-zenhei +-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-vlgothic,japanese-sazanami,japanese-kochi ++sequence.allfonts.x-euc-jp-linux=latin-1,japanese-ipafont-gothic,japanese-ipafont-mincho,japanese-vlgothic,japanese-sazanami + sequence.allfonts.EUC-KR=latin-1,korean-nanum + sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-microhei,wqy-zenhei + sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-microhei,wqy-zenhei +-#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala +-sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-sazanami,japanese-kochi,korean-nanumcoding,korean-nanum,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu ++#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-ipafont-gothic,japanese-vlgothic,japanese-sazanami,korean-un,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala ++sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-ipafont-gothic,japanese-vlgothic,japanese-sazanami,korean-nanumcoding,korean-nanum,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu ++ +++sequence.fallback=wqy-microhei,uminghk,shanheisun,wqy-zenhei,japanese-ipafont-gothic,japanese-ipafont-mincho,japanese-vlgothic,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu + + # Exclusion Ranges + +-exclusion.japanese-kochi=0390-03d6,2200-22ef,2701-27be + exclusion.japanese-sazanami=0390-03d6,2200-22ef,2701-27be + exclusion.japanese-vlgothic=0390-03d6,2200-22ef,2701-27be ++exclusion.japanese-ipafont-gothic=0390-03d6,2200-22ef,2701-27be ++exclusion.japanese-ipafont-mincho=0390-03d6,2200-22ef,2701-27be + + # Font File Names + +@@ -244,12 +247,16 @@ + filename.NanumGothic_Bold=/usr/share/fonts/truetype/nanum/NanumGothicBold.ttf + filename.NanumGothicCoding=/usr/share/fonts/truetype/nanum-coding/NanumGothic_Coding.ttf + filename.NanumGothicCoding_Bold=/usr/share/fonts/truetype/nanum-coding/NanumGothic_Coding_Bold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf ++ ++#Japanese fonts + filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf + filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf + filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf + filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf ++filename.IPAGothic=/usr/share/fonts/opentype/ipafont-gothic/ipag.ttf ++filename.IPAPGothic=/usr/share/fonts/opentype/ipafont-gothic/ipagp.ttf ++filename.IPAMincho=/usr/share/fonts/opentype/ipafont-mincho/ipam.ttf ++filename.IPAPMincho=/usr/share/fonts/opentype/ipafont-mincho/ipamp.ttf + + filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf + filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +@@ -283,8 +290,9 @@ + awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic + awtfontpath.wqy-microhei=/usr/share/fonts/truetype/wqy + awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi + awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami + awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic ++awtfontpath.japanese-ipafont-gothic=/usr/share/fonts/opentype/ipafont-gothic ++awtfontpath.japanese-ipafont-mincho=/usr/share/fonts/opentype/ipafont-mincho + awtfontpath.korean-nanum=/usr/share/fonts/truetype/nanum + awtfontpath.korean-nanumcoding=/usr/share/fonts/truetype/nanum-coding